net: Move fib_nh and fib6_nh to a common struct
Subsystems (9)
David Ahern
maintainerPATCH v3 1/13 ipv4: Define fib_get_nhs when CONFIG_IP_ROUTE_MULTIPATH is disabled
In reply to David AhernFrom: David Ahern <[email protected]>
Define fib_get_nhs to return EINVAL when CONFIG_IP_ROUTE_MULTIPATH is not enabled and remove the ifdef check for CONFIG_IP_ROUTE_MULTIPATH in fib_create_info.
--- net/ipv4/fib_semantics.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
net/ipv4/fib_semantics.c +9 -6
@@ -601,6 +601,15 @@ static void fib_rebalance(struct fib_info *fi) }#else /* CONFIG_IP_ROUTE_MULTIPATH */ +static int fib_get_nhs (struct fib_info *fi,struct rtnexthop *rtnh, +int remaining,struct fib_config *cfg, +struct netlink_ext_ack *extack) +{ +NL_SET_ERR_MSG (extack,"Multipath support not enabled in kernel" ); + +return -EINVAL ; +} +#define fib_rebalance (fi) do { } while (0)#endif /* CONFIG_IP_ROUTE_MULTIPATH */
@@ -1102,7 +1111,6 @@ struct fib_info *fib_create_info(struct fib_config *cfg, }endfor_nexthops (fi) if (cfg->fc_mp) { -#ifdef CONFIG_IP_ROUTE_MULTIPATH err =fib_get_nhs (fi, cfg->fc_mp, cfg->fc_mp_len, cfg, extack);if (err !=0 ) goto failure;
@@ -1123,11 +1131,6 @@ struct fib_info *fib_create_info(struct fib_config *cfg, goto err_inval; }#endif -#else -NL_SET_ERR_MSG (extack, -"Multipath support not enabled in kernel" ); - goto err_inval; -#endif }else {struct fib_nh *nh = fi->fib_nh;
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v3 2/13 ipv4: Move IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN to helper
In reply to David AhernFrom: David Ahern <[email protected]>
in_dev lookup followed by IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN check is called in several places, some with the rcu lock and others with the rtnl held.
Move the check to a helper similar to what IPv6 has. Since the helper can be invoked from either context use rcu_dereference_rtnl to dereference ip_ptr.
--- include/linux/inetdevice.h | 14 ++++++++++++++ net/ipv4/fib_semantics.c | 31 +++++++------------------------ net/ipv4/fib_trie.c | 4 +--- 3 files changed, 22 insertions(+), 27 deletions(-)
include/linux/inetdevice.h +14 -0
@@ -237,6 +237,20 @@ static inline struct in_device *__in_dev_get_rtnl(const struct net_device *dev)return rtnl_dereference (dev->ip_ptr); } +/* called with rcu_read_lock or rtnl held */ +static inline bool ip_ignore_linkdown (const struct net_device *dev) +{ +struct in_device *in_dev; +bool rc = false; + + in_dev =rcu_dereference_rtnl (dev->ip_ptr); +if (in_dev && +IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN (in_dev)) + rc = true; + +return rc; +} +static inline struct neigh_parms *__in_dev_arp_parms_get_rcu (const struct net_device *dev) {struct in_device *in_dev =__in_dev_get_rcu (dev);
net/ipv4/fib_semantics.c +7 -24
@@ -558,7 +558,6 @@ static void fib_rebalance(struct fib_info *fi) {int total;int w; -struct in_device *in_dev;if (fi->fib_nhs <2 )return ;
@@ -568,10 +567,7 @@ static void fib_rebalance(struct fib_info *fi)if (nh->nh_flags &RTNH_F_DEAD )continue ; - in_dev =__in_dev_get_rtnl (nh->nh_dev); - -if (in_dev && -IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN (in_dev) && +if (ip_ignore_linkdown (nh->nh_dev) && nh->nh_flags &RTNH_F_LINKDOWN )continue ;
@@ -582,12 +578,9 @@ static void fib_rebalance(struct fib_info *fi)change_nexthops (fi) {int upper_bound; - in_dev =__in_dev_get_rtnl (nexthop_nh->nh_dev); -if (nexthop_nh->nh_flags &RTNH_F_DEAD ) { upper_bound =-1 ; - }else if (in_dev && -IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN (in_dev) && + }else if (ip_ignore_linkdown (nexthop_nh->nh_dev) && nexthop_nh->nh_flags &RTNH_F_LINKDOWN ) { upper_bound =-1 ; }else {
@@ -1325,12 +1318,8 @@ int fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event, nla_put_u32(skb, RTA_OIF, fi->fib_nh->nh_oif)) goto nla_put_failure;if (fi->fib_nh->nh_flags &RTNH_F_LINKDOWN ) { -struct in_device *in_dev; -rcu_read_lock (); - in_dev =__in_dev_get_rcu (fi->fib_nh->nh_dev); -if (in_dev && -IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN (in_dev)) +if (ip_ignore_linkdown (fi->fib_nh->nh_dev)) rtm->rtm_flags |=RTNH_F_DEAD ;rcu_read_unlock (); }
@@ -1361,12 +1350,8 @@ int fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event, rtnh->rtnh_flags = nh->nh_flags &0xFF ;if (nh->nh_flags &RTNH_F_LINKDOWN ) { -struct in_device *in_dev; -rcu_read_lock (); - in_dev =__in_dev_get_rcu (nh->nh_dev); -if (in_dev && -IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN (in_dev)) +if (ip_ignore_linkdown (nh->nh_dev)) rtnh->rtnh_flags |=RTNH_F_DEAD ;rcu_read_unlock (); }
@@ -1433,7 +1418,7 @@ int fib_sync_down_addr(struct net_device *dev, __be32 local)static int call_fib_nh_notifiers (struct fib_nh *fib_nh,enum fib_event_type event_type) { -struct in_device *in_dev =__in_dev_get_rtnl (fib_nh->nh_dev); +bool ignore_link_down =ip_ignore_linkdown (fib_nh->nh_dev);struct fib_nh_notifier_info info = { .fib_nh = fib_nh, };
@@ -1442,14 +1427,12 @@ static int call_fib_nh_notifiers(struct fib_nh *fib_nh,case FIB_EVENT_NH_ADD :if (fib_nh->nh_flags &RTNH_F_DEAD )break ; -if (IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN (in_dev) && - fib_nh->nh_flags &RTNH_F_LINKDOWN ) +if (ignore_link_down && fib_nh->nh_flags &RTNH_F_LINKDOWN )break ;return call_fib4_notifiers (dev_net (fib_nh->nh_dev), event_type, &info.info);case FIB_EVENT_NH_DEL : -if ((in_dev &&IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN (in_dev) && - fib_nh->nh_flags &RTNH_F_LINKDOWN ) || +if ((ignore_link_down && fib_nh->nh_flags &RTNH_F_LINKDOWN ) || (fib_nh->nh_flags &RTNH_F_DEAD ))return call_fib4_notifiers (dev_net (fib_nh->nh_dev), event_type, &info.info);
net/ipv4/fib_trie.c +1 -3
@@ -1471,12 +1471,10 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,continue ;for (nhsel =0 ; nhsel < fi->fib_nhs; nhsel++) {const struct fib_nh *nh = &fi->fib_nh[nhsel]; -struct in_device *in_dev =__in_dev_get_rcu (nh->nh_dev);if (nh->nh_flags &RTNH_F_DEAD )continue ; -if (in_dev && -IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN (in_dev) && +if (ip_ignore_linkdown (nh->nh_dev) && nh->nh_flags &RTNH_F_LINKDOWN && !(fib_flags &FIB_LOOKUP_IGNORE_LINKSTATE ))continue ;
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v3 5/13 ipv6: Create init helper for fib6_nh
In reply to David AhernFrom: David Ahern <[email protected]>
Similar to IPv4, consolidate the fib6_nh initialization into a helper. As a new standalone function, add a cleanup path to put lwtstate on error.
To avoid modifying fib6_config flags, move the reject check to a helper that is invoked once by fib6_nh_init to reset the device and then again in ip6_route_info_create to set the fib6_flags.
--- include/net/ip6_fib.h | 4 + net/ipv6/route.c | 249 ++++++++++++++++++++++++++++---------------------- 2 files changed, 145 insertions(+), 108 deletions(-)
include/net/ip6_fib.h +4 -0
@@ -444,6 +444,10 @@ static inline struct net_device *fib6_info_nh_dev(const struct fib6_info *f6i)return f6i->fib6_nh.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); +static inline struct lwtunnel_state *fib6_info_nh_lwt (const struct fib6_info *f6i) {
net/ipv6/route.c +141 -108
294 lines not on this page · raw message
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v3 6/13 ipv6: Create cleanup helper for fib6_nh
In reply to David AhernFrom: David Ahern <[email protected]>
Move the fib6_nh cleanup code to a new helper, fib6_nh_release.
--- include/net/ip6_fib.h | 1 + net/ipv6/ip6_fib.c | 5 +---- net/ipv6/route.c | 8 ++++++++ 3 files changed, 10 insertions(+), 4 deletions(-)
include/net/ip6_fib.h +1 -0
@@ -447,6 +447,7 @@ static inline struct net_device *fib6_info_nh_dev(const struct fib6_info *f6i)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); +void fib6_nh_release (struct fib6_nh *fib6_nh);static inline struct lwtunnel_state *fib6_info_nh_lwt (const struct fib6_info *f6i)
net/ipv6/ip6_fib.c +1 -4
@@ -199,10 +199,7 @@ void fib6_info_destroy_rcu(struct rcu_head *head)free_percpu (f6i->rt6i_pcpu); } -lwtstate_put (f6i->fib6_nh.nh_lwtstate); - -if (f6i->fib6_nh.nh_dev) -dev_put (f6i->fib6_nh.nh_dev); +fib6_nh_release (&f6i->fib6_nh);ip_fib_metrics_put (f6i->fib6_metrics);
net/ipv6/route.c +8 -0
@@ -3025,6 +3025,14 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh,return err; } +void fib6_nh_release (struct fib6_nh *fib6_nh) +{ +lwtstate_put (fib6_nh->nh_lwtstate); + +if (fib6_nh->nh_dev) +dev_put (fib6_nh->nh_dev); +} +static struct fib6_info *ip6_route_info_create (struct fib6_config *cfg,gfp_t gfp_flags,struct netlink_ext_ack *extack)
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v3 10/13 ipv4: Rename fib_nh entries
In reply to David AhernFrom: David Ahern <[email protected]>
Rename fib_nh entries that will be moved to a fib_nh_common struct. Specifically, the device, oif, gateway, flags, scope, lwtstate, nh_weight and nh_upper_bound are common with all nexthop definitions. In the process shorten fib_nh_lwtstate to fib_nh_lws to avoid really long lines.
Rename only; no functional change intended.
--- drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 12 +- .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 22 +- drivers/net/ethernet/rocker/rocker_ofdpa.c | 10 +- include/net/ip_fib.h | 24 +-- include/trace/events/fib.h | 7 +- net/core/filter.c | 8 +- net/ipv4/fib_frontend.c | 10 +- net/ipv4/fib_semantics.c | 229 +++++++++++---------- net/ipv4/fib_trie.c | 12 +- net/ipv4/route.c | 18 +- 10 files changed, 178 insertions(+), 174 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c +6 -6
@@ -122,7 +122,7 @@ static void mlx5_lag_fib_route_event(struct mlx5_lag *ldev,/* Handle add/replace event */ if (fi->fib_nhs ==1 ) {if (__mlx5_lag_is_active (ldev)) { -struct net_device *nh_dev = fi->fib_nh[0 ].nh_dev; +struct net_device *nh_dev = fi->fib_nh[0 ].fib_nh_dev;int i =mlx5_lag_dev_get_netdev_idx (ldev, nh_dev);mlx5_lag_set_port_affinity (ldev, ++i);
@@ -134,10 +134,10 @@ static void mlx5_lag_fib_route_event(struct mlx5_lag *ldev,return ;/* Verify next hops are ports of the same hca */ -if (!(fi->fib_nh[0 ].nh_dev == ldev->pf[0 ].netdev && - fi->fib_nh[1 ].nh_dev == ldev->pf[1 ].netdev) && - !(fi->fib_nh[0 ].nh_dev == ldev->pf[1 ].netdev && - fi->fib_nh[1 ].nh_dev == ldev->pf[0 ].netdev)) { +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)) {mlx5_core_warn (ldev->pf[0 ].dev,"Multipath offload require two ports of the same HCA\n" );return ; }
@@ -167,7 +167,7 @@ static void mlx5_lag_fib_nexthop_event(struct mlx5_lag *ldev,/* nh added/removed */ if (event ==FIB_EVENT_NH_DEL ) { -int i =mlx5_lag_dev_get_netdev_idx (ldev, fib_nh->nh_dev); +int i =mlx5_lag_dev_get_netdev_idx (ldev, fib_nh->fib_nh_dev);if (i >=0 ) { i = (i +1 ) %2 +1 ;/* peer port */
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +11 -11
@@ -3610,7 +3610,7 @@ static bool mlxsw_sp_nexthop4_ipip_type(const struct mlxsw_sp *mlxsw_sp,const struct fib_nh *fib_nh, enum mlxsw_sp_ipip_type *p_ipipt) { - struct net_device *dev = fib_nh->nh_dev; + struct net_device *dev = fib_nh->fib_nh_dev;return dev && fib_nh->nh_parent->fib_type == RTN_UNICAST &&
@@ -3637,7 +3637,7 @@ static int mlxsw_sp_nexthop4_type_init(struct mlxsw_sp *mlxsw_sp, struct fib_nh *fib_nh) {const struct mlxsw_sp_ipip_ops *ipip_ops; -struct net_device *dev = fib_nh->nh_dev; +struct net_device *dev = fib_nh->fib_nh_dev;struct mlxsw_sp_ipip_entry *ipip_entry;struct mlxsw_sp_rif *rif;int err;
@@ -3681,18 +3681,18 @@ static int mlxsw_sp_nexthop4_init(struct mlxsw_sp *mlxsw_sp,struct mlxsw_sp_nexthop *nh, struct fib_nh *fib_nh) { - struct net_device *dev = fib_nh->nh_dev; + struct net_device *dev = fib_nh->fib_nh_dev;struct in_device *in_dev;int err; nh->nh_grp = nh_grp; nh->key.fib_nh = fib_nh;#ifdef CONFIG_IP_ROUTE_MULTIPATH - nh->nh_weight = fib_nh->nh_weight; + nh->nh_weight = fib_nh->fib_nh_weight;#else nh->nh_weight =1 ;#endif -memcpy (&nh->gw_addr, &fib_nh->nh_gw,sizeof (fib_nh->nh_gw)); +memcpy (&nh->gw_addr, &fib_nh->fib_nh_gw4,sizeof (fib_nh->fib_nh_gw4)); err =mlxsw_sp_nexthop_insert (mlxsw_sp, nh);if (err)return err;
@@ -3705,7 +3705,7 @@ static int mlxsw_sp_nexthop4_init(struct mlxsw_sp *mlxsw_sp, in_dev =__in_dev_get_rtnl (dev);if (in_dev &&IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN (in_dev) && - fib_nh->nh_flags &RTNH_F_LINKDOWN ) + fib_nh->fib_nh_flags &RTNH_F_LINKDOWN )return 0 ; err =mlxsw_sp_nexthop4_type_init (mlxsw_sp, nh, fib_nh);
@@ -3804,7 +3804,7 @@ 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) { -return fi->fib_nh->nh_scope ==RT_SCOPE_LINK || +return fi->fib_nh->fib_nh_scope ==RT_SCOPE_LINK ||mlxsw_sp_nexthop4_ipip_type (mlxsw_sp, fi->fib_nh,NULL ); }
@@ -3966,7 +3966,7 @@ mlxsw_sp_fib4_entry_offload_set(struct mlxsw_sp_fib_entry *fib_entry) fib_entry->type ==MLXSW_SP_FIB_ENTRY_TYPE_BLACKHOLE || fib_entry->type ==MLXSW_SP_FIB_ENTRY_TYPE_IPIP_DECAP || fib_entry->type == MLXSW_SP_FIB_ENTRY_TYPE_NVE_DECAP) { - nh_grp->nexthops->key.fib_nh->nh_flags |= RTNH_F_OFFLOAD; + nh_grp->nexthops->key.fib_nh->fib_nh_flags |= RTNH_F_OFFLOAD;return ; }
@@ -3974,9 +3974,9 @@ mlxsw_sp_fib4_entry_offload_set(struct mlxsw_sp_fib_entry *fib_entry)struct mlxsw_sp_nexthop *nh = &nh_grp->nexthops[i];if (nh->offloaded) - nh->key.fib_nh->nh_flags |=RTNH_F_OFFLOAD ; + nh->key.fib_nh->fib_nh_flags |=RTNH_F_OFFLOAD ;else - nh->key.fib_nh->nh_flags &= ~RTNH_F_OFFLOAD ; + nh->key.fib_nh->fib_nh_flags &= ~RTNH_F_OFFLOAD ; } }
@@ -3992,7 +3992,7 @@ mlxsw_sp_fib4_entry_offload_unset(struct mlxsw_sp_fib_entry *fib_entry)for (i =0 ; i < nh_grp->count; i++) {struct mlxsw_sp_nexthop *nh = &nh_grp->nexthops[i]; - nh->key.fib_nh->nh_flags &= ~RTNH_F_OFFLOAD ; + nh->key.fib_nh->fib_nh_flags &= ~RTNH_F_OFFLOAD ; } }
drivers/net/ethernet/rocker/rocker_ofdpa.c +5 -5
@@ -2288,11 +2288,11 @@ static int ofdpa_port_fib_ipv4(struct ofdpa_port *ofdpa_port, __be32 dst, nh = fi->fib_nh; nh_on_port = (fi->fib_dev == ofdpa_port->dev); - has_gw = !!nh->nh_gw; + has_gw = !!nh->fib_nh_gw4;if (has_gw && nh_on_port) { err =ofdpa_port_ipv4_nh (ofdpa_port, flags, - nh->nh_gw, &index); + nh->fib_nh_gw4, &index);if (err)return err;
@@ -2749,7 +2749,7 @@ static int ofdpa_fib4_add(struct rocker *rocker, fen_info->tb_id, 0);if (err)return err; - fen_info->fi->fib_nh->nh_flags |=RTNH_F_OFFLOAD ; + fen_info->fi->fib_nh->fib_nh_flags |=RTNH_F_OFFLOAD ;return 0 ; }
@@ -2764,7 +2764,7 @@ static int ofdpa_fib4_del(struct rocker *rocker, ofdpa_port =ofdpa_port_dev_lower_find (fen_info->fi->fib_dev, rocker);if (!ofdpa_port)return 0 ; - fen_info->fi->fib_nh->nh_flags &= ~RTNH_F_OFFLOAD ; + fen_info->fi->fib_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 );
@@ -2791,7 +2791,7 @@ static void ofdpa_fib4_abort(struct rocker *rocker) rocker);if (!ofdpa_port)continue ; - flow_entry->fi->fib_nh->nh_flags &= ~RTNH_F_OFFLOAD ; + flow_entry->fi->fib_nh->fib_nh_flags &= ~RTNH_F_OFFLOAD ;ofdpa_flow_tbl_del (ofdpa_port,OFDPA_OP_FLAG_REMOVE , flow_entry); }
include/net/ip_fib.h +12 -12
@@ -77,26 +77,26 @@ struct fnhe_hash_bucket {#define FNHE_RECLAIM_DEPTH 5struct fib_nh { -struct net_device *nh_dev; +struct net_device *fib_nh_dev;struct hlist_node nh_hash;struct fib_info *nh_parent; -unsigned int nh_flags; -unsigned char nh_scope; +unsigned int fib_nh_flags; +unsigned char fib_nh_scope;#ifdef CONFIG_IP_ROUTE_MULTIPATH -int nh_weight; -atomic_t nh_upper_bound; +int fib_nh_weight; +atomic_t fib_nh_upper_bound;#endif #ifdef CONFIG_IP_ROUTE_CLASSID __u32 nh_tclassid;#endif -int nh_oif; -__be32 nh_gw; +int fib_nh_oif; +__be32 fib_nh_gw4;__be32 nh_saddr;int nh_saddr_genid;struct rtable __rcu *__percpu *nh_pcpu_rth_output;struct rtable __rcu *nh_rth_input;struct fnhe_hash_bucket __rcu *nh_exceptions; -struct lwtunnel_state *nh_lwtstate; +struct lwtunnel_state *fib_nh_lws; };/*
@@ -125,7 +125,7 @@ struct fib_info {int fib_nhs;struct rcu_head rcu;struct fib_nh fib_nh[0 ]; -#define fib_dev fib_nh[0].nh_dev +#define fib_dev fib_nh[0].fib_nh_dev };
@@ -180,9 +180,9 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh); 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).nh_gw) -#define FIB_RES_DEV (res) (FIB_RES_NH(res).nh_dev) -#define FIB_RES_OIF (res) (FIB_RES_NH(res).nh_oif) +#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))
include/trace/events/fib.h +5 -2
@@ -63,13 +63,16 @@ TRACE_EVENT(fib_table_lookup, }if (nh) { +struct net_device *dev; + p32 = (__be32 *) __entry->saddr; *p32 = nh->nh_saddr; p32 = (__be32 *) __entry->gw; - *p32 = nh->nh_gw; + *p32 = nh->fib_nh_gw4; -__assign_str (name, nh->nh_dev ? nh->nh_dev->name :"-" ); + dev = nh->fib_nh_dev; +__assign_str (name, dev ? dev->name :"-" ); }else { p32 = (__be32 *) __entry->saddr; *p32 =0 ;
net/core/filter.c +4 -4
@@ -4634,12 +4634,12 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params, nh = &res.fi->fib_nh[res.nh_sel];/* do not handle lwt encaps right now */ -if (nh->nh_lwtstate) +if (nh->fib_nh_lws)return BPF_FIB_LKUP_RET_UNSUPP_LWT ; - dev = nh->nh_dev; -if (nh->nh_gw) - params->ipv4_dst = nh->nh_gw; + dev = nh->fib_nh_dev; +if (nh->fib_nh_gw4) + params->ipv4_dst = nh->fib_nh_gw4; params->rt_metric = res.fi->fib_priority;
net/ipv4/fib_frontend.c +5 -5
@@ -324,16 +324,16 @@ bool fib_info_nh_uses_dev(struct fib_info *fi, const struct net_device *dev)for (ret =0 ; ret < fi->fib_nhs; ret++) {struct fib_nh *nh = &fi->fib_nh[ret]; -if (nh->nh_dev == dev) { +if (nh->fib_nh_dev == dev) { dev_match = true;break ; - }else if (l3mdev_master_ifindex_rcu (nh->nh_dev) == dev->ifindex) { + }else if (l3mdev_master_ifindex_rcu (nh->fib_nh_dev) == dev->ifindex) { dev_match = true;break ; } }#else -if (fi->fib_nh[0 ].nh_dev == dev) +if (fi->fib_nh[0 ].fib_nh_dev == dev) dev_match = true;#endif
@@ -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).nh_scope >=RT_SCOPE_HOST ; + ret =FIB_RES_NH (res).fib_nh_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).nh_scope >=RT_SCOPE_HOST ; + ret =FIB_RES_NH (res).fib_nh_scope >=RT_SCOPE_HOST ; }return ret;
net/ipv4/fib_semantics.c +115 -114
562 lines not on this page · raw message
net/ipv4/fib_trie.c +6 -6
@@ -1472,15 +1472,15 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,for (nhsel =0 ; nhsel < fi->fib_nhs; nhsel++) {const struct fib_nh *nh = &fi->fib_nh[nhsel]; -if (nh->nh_flags &RTNH_F_DEAD ) +if (nh->fib_nh_flags &RTNH_F_DEAD )continue ; -if (ip_ignore_linkdown (nh->nh_dev) && - nh->nh_flags &RTNH_F_LINKDOWN && +if (ip_ignore_linkdown (nh->fib_nh_dev) && + nh->fib_nh_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->nh_oif) + flp->flowi4_oif != nh->fib_nh_oif)continue ; }
@@ -2651,7 +2651,7 @@ static unsigned int fib_flag_trans(int type, __be32 mask, const struct fib_infoif (type ==RTN_UNREACHABLE || type ==RTN_PROHIBIT ) flags =RTF_REJECT ; -if (fi && fi->fib_nh->nh_gw) +if (fi && fi->fib_nh->fib_nh_gw4) flags |=RTF_GATEWAY ;if (mask ==htonl (0xFFFFFFFF )) flags |=RTF_HOST ;
@@ -2702,7 +2702,7 @@ static int fib_route_seq_show(struct seq_file *seq, void *v)"%d\t%08X\t%d\t%u\t%u" , fi->fib_dev ? fi->fib_dev->name :"*" , prefix, - fi->fib_nh->nh_gw, flags,0 ,0 , + fi->fib_nh->fib_nh_gw4, flags,0 ,0 , fi->fib_priority, mask, (fi->fib_advmss ?
net/ipv4/route.c +9 -9
@@ -644,7 +644,7 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw,unsigned int i;int depth; - genid =fnhe_genid (dev_net (nh->nh_dev)); + genid =fnhe_genid (dev_net (nh->fib_nh_dev)); hval =fnhe_hashfun (daddr);spin_lock_bh (&fnhe_lock);
@@ -1356,7 +1356,7 @@ u32 ip_mtu_from_fib_result(struct fib_result *res, __be32 daddr) {struct fib_info *fi = res->fi;struct fib_nh *nh = &fi->fib_nh[res->nh_sel]; -struct net_device *dev = nh->nh_dev; +struct net_device *dev = nh->fib_nh_dev;u32 mtu =0 ; if (dev_net(dev)->ipv4.sysctl_ip_fwd_use_pmtu ||
@@ -1374,7 +1374,7 @@ u32 ip_mtu_from_fib_result(struct fib_result *res, __be32 daddr)if (likely (!mtu)) mtu =min (READ_ONCE (dev->mtu),IP_MAX_MTU ); -return mtu -lwtunnel_headroom (nh->nh_lwtstate, mtu); +return mtu -lwtunnel_headroom (nh->fib_nh_lws, mtu); } static bool rt_bind_exception(struct rtable *rt, struct fib_nh_exception *fnhe,
@@ -1531,8 +1531,8 @@ static void rt_set_nexthop(struct rtable *rt, __be32 daddr,if (fi) {struct fib_nh *nh = &FIB_RES_NH (*res); -if (nh->nh_gw && nh->nh_scope ==RT_SCOPE_LINK ) { - rt->rt_gateway = nh->nh_gw; +if (nh->fib_nh_gw4 && nh->fib_nh_scope ==RT_SCOPE_LINK ) { + rt->rt_gateway = nh->fib_nh_gw4; rt->rt_uses_gateway =1 ; }ip_dst_init_metrics (&rt->dst, fi->fib_metrics);
@@ -1540,7 +1540,7 @@ static void rt_set_nexthop(struct rtable *rt, __be32 daddr,#ifdef CONFIG_IP_ROUTE_CLASSID rt->dst.tclassid = nh->nh_tclassid;#endif - rt->dst.lwtstate =lwtstate_get (nh->nh_lwtstate); + rt->dst.lwtstate =lwtstate_get (nh->fib_nh_lws);if (unlikely (fnhe)) cached =rt_bind_exception (rt, fnhe, daddr, do_cache);else if (do_cache)
@@ -2075,7 +2075,7 @@ out: return err;if (do_cache) {struct fib_nh *nh = &FIB_RES_NH (*res); - rth->dst.lwtstate =lwtstate_get (nh->nh_lwtstate); + rth->dst.lwtstate =lwtstate_get (nh->fib_nh_lws);if (lwtunnel_input_redirect (rth->dst.lwtstate)) {WARN_ON (rth->dst.input == lwtunnel_input); rth->dst.lwtstate->orig_input = rth->dst.input;
@@ -2264,8 +2264,8 @@ static struct rtable *__mkroute_output(const struct fib_result *res, }else {if (unlikely (fl4->flowi4_flags &FLOWI_FLAG_KNOWN_NH && - !(nh->nh_gw && - nh->nh_scope ==RT_SCOPE_LINK ))) { + !(nh->fib_nh_gw4 && + nh->fib_nh_scope ==RT_SCOPE_LINK ))) { do_cache = false; goto add; }
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v3 13/13 net: Use common nexthop init and release helpers
In reply to David AhernFrom: David Ahern <[email protected]>
With fib_nh_common in place, move common initialization and release code into helpers used by both ipv4 and ipv6. For the moment, the init is just the lwt encap and the release is both the netdev reference and the the lwt state reference. More will be added later.
--- include/net/ip_fib.h | 4 ++++ net/ipv4/fib_semantics.c | 60 +++++++++++++++++++++++++++++++----------------- net/ipv6/route.c | 21 ++++------------- 3 files changed, 48 insertions(+), 37 deletions(-)
include/net/ip_fib.h +4 -0
@@ -441,6 +441,10 @@ int fib_nh_init(struct net *net, struct fib_nh *fib_nh, struct fib_config *cfg, int nh_weight, struct netlink_ext_ack *extack);void fib_nh_release (struct net *net,struct fib_nh *fib_nh); +int fib_nh_common_init (struct fib_nh_common *nhc,struct nlattr *fc_encap, +u16 fc_encap_type,void *cfg,gfp_t gfp_flags, +struct netlink_ext_ack *extack); +void fib_nh_common_release (struct fib_nh_common *nhc);/* Exported by fib_trie.c */ void fib_trie_init (void );
net/ipv4/fib_semantics.c +39 -21
90 lines not on this page · raw message
net/ipv6/route.c +5 -16
@@ -2934,18 +2934,6 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, fib6_nh->fib_nh_flags |=RTNH_F_ONLINK ; } -if (cfg->fc_encap) { -struct lwtunnel_state *lwtstate; - - err =lwtunnel_build_state (cfg->fc_encap_type, - cfg->fc_encap,AF_INET6 , cfg, - &lwtstate, extack); -if (err) - goto out; - - fib6_nh->fib_nh_lws =lwtstate_get (lwtstate); - } - fib6_nh->fib_nh_weight =1 ;/* We cannot add true routes via loopback here,
@@ -2999,6 +2987,10 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, !netif_carrier_ok(dev)) fib6_nh->fib_nh_flags |=RTNH_F_LINKDOWN ; + err =fib_nh_common_init (&fib6_nh->nh_common, cfg->fc_encap, + cfg->fc_encap_type, cfg, gfp_flags, extack); +if (err) + goto out; set_dev: fib6_nh->fib_nh_dev = dev; fib6_nh->fib_nh_oif = dev->ifindex;
@@ -3019,10 +3011,7 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh,void fib6_nh_release (struct fib6_nh *fib6_nh) { -lwtstate_put (fib6_nh->fib_nh_lws); - -if (fib6_nh->fib_nh_dev) -dev_put (fib6_nh->fib_nh_dev); +fib_nh_common_release (&fib6_nh->nh_common); } static struct fib6_info *ip6_route_info_create(struct fib6_config *cfg,
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v3 7/13 ipv6: Move gateway checks to a fib6_nh setting
In reply to David AhernFrom: David Ahern <[email protected]>
The gateway setting is not per fib6_info entry but per-fib6_nh. Add a new fib_nh_has_gw flag to fib6_nh and convert references to RTF_GATEWAY to the new flag. For IPv6 address the flag is cheaper than checking that nh_gw is non-0 like IPv4 does.
While this increases fib6_nh by 8-bytes, the effective allocation size of a fib6_info is unchanged. The 8 bytes is recovered later with a fib_nh_common change.
--- .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 4 ++-- include/net/ip6_fib.h | 1 + include/net/ip6_route.h | 4 ++-- net/core/filter.c | 2 +- net/ipv6/addrconf.c | 25 +++++++++++---------- net/ipv6/ip6_fib.c | 9 +++++--- net/ipv6/route.c | 26 +++++++++++++--------- 7 files changed, 41 insertions(+), 30 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +2 -2
@@ -4913,7 +4913,7 @@ static void mlxsw_sp_rt6_destroy(struct mlxsw_sp_rt6 *mlxsw_sp_rt6)static bool mlxsw_sp_fib6_rt_can_mp (const struct fib6_info *rt) {/* RTF_CACHE routes are ignored */ -return (rt->fib6_flags & (RTF_GATEWAY |RTF_ADDRCONF )) ==RTF_GATEWAY ; +return !(rt->fib6_flags &RTF_ADDRCONF ) && rt->fib6_nh.fib_nh_has_gw; } static struct fib6_info *
@@ -5053,7 +5053,7 @@ static void mlxsw_sp_nexthop6_fini(struct mlxsw_sp *mlxsw_sp,static bool mlxsw_sp_rt6_is_gateway (const struct mlxsw_sp *mlxsw_sp,const struct fib6_info *rt) { -return rt->fib6_flags &RTF_GATEWAY || +return rt->fib6_nh.fib_nh_has_gw ||mlxsw_sp_nexthop6_ipip_type (mlxsw_sp, rt,NULL ); }
include/net/ip6_fib.h +1 -0
@@ -126,6 +126,7 @@ struct rt6_exception {struct fib6_nh {struct in6_addr nh_gw; +bool fib_nh_has_gw;struct net_device *nh_dev;struct lwtunnel_state *nh_lwtstate;
include/net/ip6_route.h +2 -2
@@ -68,8 +68,8 @@ static inline bool rt6_need_strict(const struct in6_addr *daddr)static inline bool rt6_qualify_for_ecmp (const struct fib6_info *f6i) { -return (f6i->fib6_flags & (RTF_GATEWAY |RTF_ADDRCONF |RTF_DYNAMIC )) == -RTF_GATEWAY ; +return !(f6i->fib6_flags & (RTF_ADDRCONF |RTF_DYNAMIC )) && + f6i->fib6_nh.fib_nh_has_gw; }void ip6_route_input (struct sk_buff *skb);
net/core/filter.c +1 -1
@@ -4751,7 +4751,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,if (f6i->fib6_nh.nh_lwtstate)return BPF_FIB_LKUP_RET_UNSUPP_LWT ; -if (f6i->fib6_flags &RTF_GATEWAY ) +if (f6i->fib6_nh.fib_nh_has_gw) *dst = f6i->fib6_nh.nh_gw; dev = f6i->fib6_nh.nh_dev;
net/ipv6/addrconf.c +13 -12
@@ -173,7 +173,8 @@ static int addrconf_ifdown(struct net_device *dev, int how);static struct fib6_info *addrconf_get_prefix_route (const struct in6_addr *pfx,int plen,const struct net_device *dev, -u32 flags,u32 noflags); +u32 flags,u32 noflags, +bool no_gw);static void addrconf_dad_start (struct inet6_ifaddr *ifp);static void addrconf_dad_work (struct work_struct *w);
@@ -1230,10 +1231,8 @@ cleanup_prefix_route(struct inet6_ifaddr *ifp, unsigned long expires, bool del_r {struct fib6_info *f6i; - f6i =addrconf_get_prefix_route (&ifp->addr, - ifp->prefix_len, - ifp->idev->dev, -0 ,RTF_GATEWAY |RTF_DEFAULT ); + f6i =addrconf_get_prefix_route (&ifp->addr, ifp->prefix_len, + ifp->idev->dev,0 ,RTF_DEFAULT , true);if (f6i) {if (del_rt)ip6_del_rt (dev_net (ifp->idev->dev), f6i);
@@ -2402,7 +2401,8 @@ addrconf_prefix_route(struct in6_addr *pfx, int plen, u32 metric,static struct fib6_info *addrconf_get_prefix_route (const struct in6_addr *pfx,int plen,const struct net_device *dev, -u32 flags,u32 noflags) +u32 flags,u32 noflags, +bool no_gw) {struct fib6_node *fn;struct fib6_info *rt =NULL ;
@@ -2421,6 +2421,8 @@ static struct fib6_info *addrconf_get_prefix_route(const struct in6_addr *pfx,for_each_fib6_node_rt_rcu (fn) {if (rt->fib6_nh.nh_dev->ifindex != dev->ifindex)continue ; +if (no_gw && rt->fib6_nh.fib_nh_has_gw) +continue ;if ((rt->fib6_flags & flags) != flags)continue ;if ((rt->fib6_flags & noflags) !=0 )
@@ -2717,7 +2719,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao) pinfo->prefix_len, dev,RTF_ADDRCONF |RTF_PREFIX_RT , - RTF_GATEWAY | RTF_DEFAULT); + RTF_DEFAULT, true);if (rt) {/* Autoconf prefix route */
@@ -4588,10 +4590,8 @@ static int modify_prefix_route(struct inet6_ifaddr *ifp,struct fib6_info *f6i;u32 prio; - f6i =addrconf_get_prefix_route (&ifp->addr, - ifp->prefix_len, - ifp->idev->dev, -0 ,RTF_GATEWAY |RTF_DEFAULT ); + f6i =addrconf_get_prefix_route (&ifp->addr, ifp->prefix_len, + ifp->idev->dev,0 ,RTF_DEFAULT , true);if (!f6i)return -ENOENT ;
@@ -5972,7 +5972,8 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)struct fib6_info *rt; rt =addrconf_get_prefix_route (&ifp->peer_addr,128 , - ifp->idev->dev,0 ,0 ); + ifp->idev->dev,0 ,0 , + false);if (rt)ip6_del_rt (net, rt); }
net/ipv6/ip6_fib.c +6 -3
@@ -2294,6 +2294,7 @@ static int ipv6_route_seq_show(struct seq_file *seq, void *v) {struct fib6_info *rt = v;struct ipv6_route_iter *iter = seq->private; +unsigned int flags = rt->fib6_flags;const struct net_device *dev;seq_printf (seq,"%pi6 %02x " , &rt->fib6_dst.addr, rt->fib6_dst.plen);
@@ -2303,15 +2304,17 @@ static int ipv6_route_seq_show(struct seq_file *seq, void *v)#else seq_puts (seq,"00000000000000000000000000000000 00 " );#endif -if (rt->fib6_flags &RTF_GATEWAY ) +if (rt->fib6_nh.fib_nh_has_gw) { + flags |=RTF_GATEWAY ;seq_printf (seq,"%pi6" , &rt->fib6_nh.nh_gw); -else + }else {seq_puts (seq,"00000000000000000000000000000000" ); + } dev = rt->fib6_nh.nh_dev;seq_printf (seq," %08x %08x %08x %08x %8s\n" , rt->fib6_metric,atomic_read (&rt->fib6_ref),0 , - rt->fib6_flags, dev ? dev->name :"" ); + flags, dev ? dev->name :"" ); iter->w.leaf =NULL ;return 0 ; }
net/ipv6/route.c +16 -10
@@ -533,7 +533,7 @@ static void rt6_probe(struct fib6_info *rt)* Router Reachability Probe MUST be rate-limited * to no more than one per minute. */ -if (!rt || !(rt->fib6_flags &RTF_GATEWAY )) +if (!rt || !rt->fib6_nh.fib_nh_has_gw)return ; nh_gw = &rt->fib6_nh.nh_gw;
@@ -595,7 +595,7 @@ static inline enum rt6_nud_state rt6_check_neigh(struct fib6_info *rt)struct neighbour *neigh;if (rt->fib6_flags &RTF_NONEXTHOP || - !(rt->fib6_flags &RTF_GATEWAY )) + !rt->fib6_nh.fib_nh_has_gw)return RT6_NUD_SUCCEED ;rcu_read_lock_bh ();
@@ -784,7 +784,7 @@ static struct fib6_info *rt6_select(struct net *net, struct fib6_node *fn,static bool rt6_is_gw_or_nonexthop (const struct fib6_info *rt) { -return (rt->fib6_flags & (RTF_NONEXTHOP |RTF_GATEWAY )); +return (rt->fib6_flags &RTF_NONEXTHOP ) || rt->fib6_nh.fib_nh_has_gw; }#ifdef CONFIG_IPV6_ROUTE_INFO
@@ -989,8 +989,11 @@ static void ip6_rt_copy_init(struct rt6_info *rt, struct fib6_info *ort) rt->rt6i_dst = ort->fib6_dst; rt->rt6i_idev = dev ?in6_dev_get (dev) :NULL ; - rt->rt6i_gateway = ort->fib6_nh.nh_gw; rt->rt6i_flags = ort->fib6_flags; +if (ort->fib6_nh.fib_nh_has_gw) { + rt->rt6i_gateway = ort->fib6_nh.nh_gw; + rt->rt6i_flags |=RTF_GATEWAY ; + }rt6_set_from (rt, ort);#ifdef CONFIG_IPV6_SUBTREES rt->rt6i_src = ort->fib6_src;
@@ -1872,7 +1875,7 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,rcu_read_unlock ();return rt; }else if (unlikely ((fl6->flowi6_flags &FLOWI_FLAG_KNOWN_NH ) && - !(f6i->fib6_flags &RTF_GATEWAY ))) { + !f6i->fib6_nh.fib_nh_has_gw)) {/* Create a RTF_CACHE clone which will not be * owned by the fib6 tree. It is for the special case where * the daddr in the skb during the neighbor look-up is different
@@ -2442,7 +2445,7 @@ static struct rt6_info *__ip6_route_redirect(struct net *net,continue ;if (rt->fib6_flags &RTF_REJECT )break ; -if (!(rt->fib6_flags &RTF_GATEWAY )) +if (!rt->fib6_nh.fib_nh_has_gw)continue ;if (fl6->flowi6_oif != rt->fib6_nh.nh_dev->ifindex)continue ;
@@ -2986,6 +2989,7 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, goto out; fib6_nh->nh_gw = cfg->fc_gateway; + fib6_nh->fib_nh_has_gw =1 ; } err = -ENODEV ;
@@ -3121,7 +3125,7 @@ static struct fib6_info *ip6_route_info_create(struct fib6_config *cfg, rt->fib6_table = table; rt->fib6_metric = cfg->fc_metric; rt->fib6_type = cfg->fc_type; - rt->fib6_flags = cfg->fc_flags; + rt->fib6_flags = cfg->fc_flags & ~RTF_GATEWAY ;ipv6_addr_prefix (&rt->fib6_dst.addr, &cfg->fc_dst, cfg->fc_dst_len); rt->fib6_dst.plen = cfg->fc_dst_len;
@@ -3490,7 +3494,8 @@ static struct fib6_info *rt6_get_route_info(struct net *net,for_each_fib6_node_rt_rcu (fn) {if (rt->fib6_nh.nh_dev->ifindex != ifindex)continue ; -if ((rt->fib6_flags & (RTF_ROUTEINFO |RTF_GATEWAY )) != (RTF_ROUTEINFO |RTF_GATEWAY )) +if (!(rt->fib6_flags &RTF_ROUTEINFO ) || + !rt->fib6_nh.fib_nh_has_gw)continue ;if (!ipv6_addr_equal (&rt->fib6_nh.nh_gw, gwaddr))continue ;
@@ -3811,7 +3816,7 @@ void rt6_remove_prefsrc(struct inet6_ifaddr *ifp)fib6_clean_all (net, fib6_remove_prefsrc, &adni); } -#define RTF_RA_ROUTER (RTF_ADDRCONF | RTF_DEFAULT | RTF_GATEWAY) +#define RTF_RA_ROUTER (RTF_ADDRCONF | RTF_DEFAULT)/* Remove routers and update dst entries when gateway turn into host. */ static int fib6_clean_tohost (struct fib6_info *rt,void *arg)
@@ -3819,6 +3824,7 @@ static int fib6_clean_tohost(struct fib6_info *rt, void *arg)struct in6_addr *gateway = (struct in6_addr *)arg;if (((rt->fib6_flags &RTF_RA_ROUTER ) ==RTF_RA_ROUTER ) && + rt->fib6_nh.fib_nh_has_gw &&ipv6_addr_equal (gateway, &rt->fib6_nh.nh_gw)) {return -1 ; }
@@ -4607,7 +4613,7 @@ static int rt6_nexthop_info(struct sk_buff *skb, struct fib6_info *rt,rcu_read_unlock (); } -if (rt->fib6_flags &RTF_GATEWAY ) { +if (rt->fib6_nh.fib_nh_has_gw) {if (nla_put_in6_addr (skb,RTA_GATEWAY , &rt->fib6_nh.nh_gw) <0 ) goto nla_put_failure; }
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v3 8/13 ipv6: Refactor fib6_ignore_linkdown
In reply to David AhernFrom: David Ahern <[email protected]>
fib6_ignore_linkdown takes a fib6_info but only looks at the net_device and its IPv6 config. Change it to take a net_device over a fib6_info as its input argument.
In addition, move it to a header file to make the check inline and usable later with IPv4 code without going through the ipv6 stub, and rename to ip6_ignore_linkdown since it is only checking the setting based on the ipv6 struct on a device.
--- include/net/addrconf.h | 8 ++++++++ net/ipv6/route.c | 21 +++------------------ 2 files changed, 11 insertions(+), 18 deletions(-)
include/net/addrconf.h +8 -0
@@ -425,6 +425,14 @@ static inline void in6_dev_hold(struct inet6_dev *idev)refcount_inc (&idev->refcnt); } +/* called with rcu_read_lock held */ +static inline bool ip6_ignore_linkdown (const struct net_device *dev) +{ +const struct inet6_dev *idev =__in6_dev_get (dev); + +return !!idev->cnf.ignore_routes_with_linkdown; +} +void inet6_ifa_finish_destroy (struct inet6_ifaddr *ifp);static inline void in6_ifa_put (struct inet6_ifaddr *ifp)
net/ipv6/route.c +3 -18
@@ -639,21 +639,6 @@ static int rt6_score_route(struct fib6_info *rt, int oif, int strict)return m; } -/* called with rc_read_lock held */ -static inline bool fib6_ignore_linkdown (const struct fib6_info *f6i) -{ -const struct net_device *dev =fib6_info_nh_dev (f6i); -bool rc = false; - -if (dev) { -const struct inet6_dev *idev =__in6_dev_get (dev); - - rc = !!idev->cnf.ignore_routes_with_linkdown; - } - -return rc; -} -static struct fib6_info *find_match (struct fib6_info *rt,int oif,int strict,int *mpri,struct fib6_info *match,bool *do_rr)
@@ -664,7 +649,7 @@ static struct fib6_info *find_match(struct fib6_info *rt, int oif, int strict,if (rt->fib6_nh.nh_flags &RTNH_F_DEAD ) goto out; -if (fib6_ignore_linkdown (rt) && +if (ip6_ignore_linkdown (rt->fib6_nh.nh_dev) && rt->fib6_nh.nh_flags &RTNH_F_LINKDOWN && !(strict &RT6_LOOKUP_F_IGNORE_LINKSTATE )) goto out;
@@ -3875,7 +3860,7 @@ static bool rt6_is_dead(const struct fib6_info *rt) {if (rt->fib6_nh.nh_flags &RTNH_F_DEAD || (rt->fib6_nh.nh_flags &RTNH_F_LINKDOWN && -fib6_ignore_linkdown (rt))) +ip6_ignore_linkdown (rt->fib6_nh.nh_dev)))return true;return false;
@@ -4608,7 +4593,7 @@ static int rt6_nexthop_info(struct sk_buff *skb, struct fib6_info *rt, *flags |=RTNH_F_LINKDOWN ;rcu_read_lock (); -if (fib6_ignore_linkdown (rt)) +if (ip6_ignore_linkdown (rt->fib6_nh.nh_dev)) *flags |=RTNH_F_DEAD ;rcu_read_unlock (); }
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v3 9/13 ipv6: Change rt6_add_nexthop and rt6_nexthop_info to take fib6_nh
In reply to David AhernFrom: David Ahern <[email protected]>
rt6_add_nexthop and rt6_nexthop_info only need the fib6_info for the gateway flag and the nexthop weight, and the presence of a gateway is now per-nexthop. Update the signatures to take a fib6_nh and nexthop weight and better align with the ipv4 versions.
--- net/ipv6/route.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-)
net/ipv6/route.c +20 -19
@@ -4583,37 +4583,37 @@ static size_t rt6_nlmsg_size(struct fib6_info *rt) + nexthop_len; } -static int rt6_nexthop_info (struct sk_buff *skb,struct fib6_info *rt, +static int rt6_nexthop_info (struct sk_buff *skb,const struct fib6_nh *fib6_nh,unsigned int *flags,bool skip_oif) { -if (rt->fib6_nh.nh_flags &RTNH_F_DEAD ) +if (fib6_nh->nh_flags &RTNH_F_DEAD ) *flags |=RTNH_F_DEAD ; -if (rt->fib6_nh.nh_flags &RTNH_F_LINKDOWN ) { +if (fib6_nh->nh_flags &RTNH_F_LINKDOWN ) { *flags |=RTNH_F_LINKDOWN ;rcu_read_lock (); -if (ip6_ignore_linkdown (rt->fib6_nh.nh_dev)) +if (ip6_ignore_linkdown (fib6_nh->nh_dev)) *flags |=RTNH_F_DEAD ;rcu_read_unlock (); } -if (rt->fib6_nh.fib_nh_has_gw) { -if (nla_put_in6_addr (skb,RTA_GATEWAY , &rt->fib6_nh.nh_gw) <0 ) +if (fib6_nh->fib_nh_has_gw) { +if (nla_put_in6_addr (skb,RTA_GATEWAY , &fib6_nh->nh_gw) <0 ) goto nla_put_failure; } - *flags |= (rt->fib6_nh.nh_flags &RTNH_F_ONLINK ); -if (rt->fib6_nh.nh_flags &RTNH_F_OFFLOAD ) + *flags |= (fib6_nh->nh_flags &RTNH_F_ONLINK ); +if (fib6_nh->nh_flags &RTNH_F_OFFLOAD ) *flags |=RTNH_F_OFFLOAD ;/* not needed for multipath encoding b/c it has a rtnexthop struct */ -if (!skip_oif && rt->fib6_nh.nh_dev && -nla_put_u32 (skb,RTA_OIF , rt->fib6_nh.nh_dev->ifindex)) +if (!skip_oif && fib6_nh->nh_dev && +nla_put_u32 (skb,RTA_OIF , fib6_nh->nh_dev->ifindex)) goto nla_put_failure; -if (rt->fib6_nh.nh_lwtstate && -lwtunnel_fill_encap (skb, rt->fib6_nh.nh_lwtstate) <0 ) +if (fib6_nh->nh_lwtstate && +lwtunnel_fill_encap (skb, fib6_nh->nh_lwtstate) <0 ) goto nla_put_failure;return 0 ;
@@ -4623,9 +4623,9 @@ static int rt6_nexthop_info(struct sk_buff *skb, struct fib6_info *rt, }/* add multipath next hop */ -static int rt6_add_nexthop (struct sk_buff *skb,struct fib6_info *rt) +static int rt6_add_nexthop (struct sk_buff *skb,const struct fib6_nh *fib6_nh) { -const struct net_device *dev = rt->fib6_nh.nh_dev; +const struct net_device *dev = fib6_nh->nh_dev;struct rtnexthop *rtnh;unsigned int flags =0 ;
@@ -4633,10 +4633,10 @@ static int rt6_add_nexthop(struct sk_buff *skb, struct fib6_info *rt)if (!rtnh) goto nla_put_failure; - rtnh->rtnh_hops = rt->fib6_nh.nh_weight -1 ; + rtnh->rtnh_hops = fib6_nh->nh_weight -1 ; rtnh->rtnh_ifindex = dev ? dev->ifindex :0 ; -if (rt6_nexthop_info (skb, rt, &flags, true) <0 ) +if (rt6_nexthop_info (skb, fib6_nh, &flags, true) <0 ) goto nla_put_failure; rtnh->rtnh_flags = flags;
@@ -4766,18 +4766,19 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb,if (!mp) goto nla_put_failure; -if (rt6_add_nexthop (skb, rt) <0 ) +if (rt6_add_nexthop (skb, &rt->fib6_nh) <0 ) goto nla_put_failure;list_for_each_entry_safe (sibling, next_sibling, &rt->fib6_siblings, fib6_siblings) { -if (rt6_add_nexthop (skb, sibling) <0 ) +if (rt6_add_nexthop (skb, &sibling->fib6_nh) <0 ) goto nla_put_failure; }nla_nest_end (skb, mp); }else { -if (rt6_nexthop_info (skb, rt, &rtm->rtm_flags, false) <0 ) +if (rt6_nexthop_info (skb, &rt->fib6_nh, &rtm->rtm_flags, + false) <0 ) goto nla_put_failure; }
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v3 11/13 ipv6: Rename fib6_nh entries
In reply to David AhernFrom: David Ahern <[email protected]>
Rename fib6_nh entries that will be moved to a fib_nh_common struct. Specifically, the device, gateway, flags, and lwtstate are common with all nexthop definitions. In some places new temporary variables are declared or local variables renamed to maintain line lengths.
Rename only; no functional change intended.
--- .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 34 ++-- include/net/ip6_fib.h | 16 +- include/net/ip6_route.h | 8 +- include/trace/events/fib6.h | 6 +- net/core/filter.c | 6 +- net/ipv6/addrconf.c | 2 +- net/ipv6/ip6_fib.c | 4 +- net/ipv6/ndisc.c | 8 +- net/ipv6/route.c | 181 +++++++++++---------- 9 files changed, 138 insertions(+), 127 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +18 -16
@@ -2873,12 +2873,13 @@ mlxsw_sp_nexthop6_group_cmp(const struct mlxsw_sp_nexthop_group *nh_grp,return false;list_for_each_entry (mlxsw_sp_rt6, &fib6_entry->rt6_list, list) { +struct fib6_nh *fib6_nh = &mlxsw_sp_rt6->rt->fib6_nh;struct in6_addr *gw;int ifindex, weight; - ifindex = mlxsw_sp_rt6->rt->fib6_nh.nh_dev->ifindex; - weight = mlxsw_sp_rt6->rt->fib6_nh.nh_weight; - gw = &mlxsw_sp_rt6->rt->fib6_nh.nh_gw; + ifindex = fib6_nh->fib_nh_dev->ifindex; + weight = fib6_nh->fib_nh_weight; + gw = &fib6_nh->fib_nh_gw6;if (!mlxsw_sp_nexthop6_group_has_nexthop (nh_grp, gw, ifindex, weight))return false;
@@ -2944,7 +2945,7 @@ mlxsw_sp_nexthop6_group_hash(struct mlxsw_sp_fib6_entry *fib6_entry, u32 seed)struct net_device *dev;list_for_each_entry (mlxsw_sp_rt6, &fib6_entry->rt6_list, list) { - dev = mlxsw_sp_rt6->rt->fib6_nh.nh_dev; + dev = mlxsw_sp_rt6->rt->fib6_nh.fib_nh_dev; val ^= dev->ifindex; }
@@ -3946,9 +3947,9 @@ mlxsw_sp_rt6_nexthop(struct mlxsw_sp_nexthop_group *nh_grp,struct mlxsw_sp_nexthop *nh = &nh_grp->nexthops[i];struct fib6_info *rt = mlxsw_sp_rt6->rt; -if (nh->rif && nh->rif->dev == rt->fib6_nh.nh_dev && +if (nh->rif && nh->rif->dev == rt->fib6_nh.fib_nh_dev &&ipv6_addr_equal ((const struct in6_addr *) &nh->gw_addr, - &rt->fib6_nh.nh_gw)) + &rt->fib6_nh.fib_nh_gw6))return nh;continue ; }
@@ -4008,19 +4009,20 @@ mlxsw_sp_fib6_entry_offload_set(struct mlxsw_sp_fib_entry *fib_entry)if (fib_entry->type ==MLXSW_SP_FIB_ENTRY_TYPE_LOCAL || fib_entry->type ==MLXSW_SP_FIB_ENTRY_TYPE_BLACKHOLE ) { list_first_entry(&fib6_entry->rt6_list, struct mlxsw_sp_rt6, - list)->rt->fib6_nh.nh_flags |=RTNH_F_OFFLOAD ; + list)->rt->fib6_nh.fib_nh_flags |=RTNH_F_OFFLOAD ;return ; }list_for_each_entry (mlxsw_sp_rt6, &fib6_entry->rt6_list, list) {struct mlxsw_sp_nexthop_group *nh_grp = fib_entry->nh_group; +struct fib6_nh *fib6_nh = &mlxsw_sp_rt6->rt->fib6_nh;struct mlxsw_sp_nexthop *nh; nh =mlxsw_sp_rt6_nexthop (nh_grp, mlxsw_sp_rt6);if (nh && nh->offloaded) - mlxsw_sp_rt6->rt->fib6_nh.nh_flags |=RTNH_F_OFFLOAD ; + fib6_nh->fib_nh_flags |=RTNH_F_OFFLOAD ;else - mlxsw_sp_rt6->rt->fib6_nh.nh_flags &= ~RTNH_F_OFFLOAD ; + fib6_nh->fib_nh_flags &= ~RTNH_F_OFFLOAD ; } }
@@ -4035,7 +4037,7 @@ mlxsw_sp_fib6_entry_offload_unset(struct mlxsw_sp_fib_entry *fib_entry)list_for_each_entry (mlxsw_sp_rt6, &fib6_entry->rt6_list, list) {struct fib6_info *rt = mlxsw_sp_rt6->rt; - rt->fib6_nh.nh_flags &= ~RTNH_F_OFFLOAD ; + rt->fib6_nh.fib_nh_flags &= ~RTNH_F_OFFLOAD ; } }
@@ -4972,8 +4974,8 @@ static bool mlxsw_sp_nexthop6_ipip_type(const struct mlxsw_sp *mlxsw_sp,const struct fib6_info *rt, enum mlxsw_sp_ipip_type *ret) { - return rt->fib6_nh.nh_dev && - mlxsw_sp_netdev_ipip_type(mlxsw_sp, rt->fib6_nh.nh_dev, ret); + return rt->fib6_nh.fib_nh_dev && + mlxsw_sp_netdev_ipip_type(mlxsw_sp, rt->fib6_nh.fib_nh_dev, ret); } static int mlxsw_sp_nexthop6_type_init(struct mlxsw_sp *mlxsw_sp,
@@ -4983,7 +4985,7 @@ static int mlxsw_sp_nexthop6_type_init(struct mlxsw_sp *mlxsw_sp, {const struct mlxsw_sp_ipip_ops *ipip_ops;struct mlxsw_sp_ipip_entry *ipip_entry; -struct net_device *dev = rt->fib6_nh.nh_dev; +struct net_device *dev = rt->fib6_nh.fib_nh_dev;struct mlxsw_sp_rif *rif;int err;
@@ -5026,11 +5028,11 @@ static int mlxsw_sp_nexthop6_init(struct mlxsw_sp *mlxsw_sp,struct mlxsw_sp_nexthop *nh, const struct fib6_info *rt) { - struct net_device *dev = rt->fib6_nh.nh_dev; + struct net_device *dev = rt->fib6_nh.fib_nh_dev; nh->nh_grp = nh_grp; - nh->nh_weight = rt->fib6_nh.nh_weight; -memcpy (&nh->gw_addr, &rt->fib6_nh.nh_gw,sizeof (nh->gw_addr)); + nh->nh_weight = rt->fib6_nh.fib_nh_weight; +memcpy (&nh->gw_addr, &rt->fib6_nh.fib_nh_gw6,sizeof (nh->gw_addr));mlxsw_sp_nexthop_counter_alloc (mlxsw_sp, nh);list_add_tail (&nh->router_list_node, &mlxsw_sp->router->nexthop_list);
include/net/ip6_fib.h +8 -8
@@ -125,14 +125,14 @@ struct rt6_exception {#define FIB6_MAX_DEPTH 5struct fib6_nh { -struct in6_addr nh_gw; +struct in6_addr fib_nh_gw6;bool fib_nh_has_gw; -struct net_device *nh_dev; -struct lwtunnel_state *nh_lwtstate; +struct net_device *fib_nh_dev; +struct lwtunnel_state *fib_nh_lws; -unsigned int nh_flags; -atomic_t nh_upper_bound; -int nh_weight; +unsigned int fib_nh_flags; +atomic_t fib_nh_upper_bound; +int fib_nh_weight; };struct fib6_info {
@@ -442,7 +442,7 @@ void rt6_get_prefsrc(const struct rt6_info *rt, struct in6_addr *addr)static inline struct net_device *fib6_info_nh_dev (const struct fib6_info *f6i) { -return f6i->fib6_nh.nh_dev; +return f6i->fib6_nh.fib_nh_dev; } int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh,
@@ -453,7 +453,7 @@ void fib6_nh_release(struct fib6_nh *fib6_nh);static inline struct lwtunnel_state *fib6_info_nh_lwt (const struct fib6_info *f6i) { -return f6i->fib6_nh.nh_lwtstate; +return f6i->fib6_nh.fib_nh_lws; } void inet6_rt_notify(int event, struct fib6_info *rt, struct nl_info *info,
include/net/ip6_route.h +5 -3
@@ -274,9 +274,11 @@ static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt,static inline bool rt6_duplicate_nexthop (struct fib6_info *a,struct fib6_info *b) { -return a->fib6_nh.nh_dev == b->fib6_nh.nh_dev && -ipv6_addr_equal (&a->fib6_nh.nh_gw, &b->fib6_nh.nh_gw) && - !lwtunnel_cmp_encap (a->fib6_nh.nh_lwtstate, b->fib6_nh.nh_lwtstate); +struct fib6_nh *nha = &a->fib6_nh, *nhb = &b->fib6_nh; + +return nha->fib_nh_dev == nhb->fib_nh_dev && +ipv6_addr_equal (&nha->fib_nh_gw6, &nhb->fib_nh_gw6) && + !lwtunnel_cmp_encap (nha->fib_nh_lws, nhb->fib_nh_lws); }static inline unsigned int ip6_dst_mtu_forward (const struct dst_entry *dst)
include/trace/events/fib6.h +3 -3
@@ -62,8 +62,8 @@ TRACE_EVENT(fib6_table_lookup, __entry->dport =0 ; } -if (f6i->fib6_nh.nh_dev) { -__assign_str (name, f6i->fib6_nh.nh_dev); +if (f6i->fib6_nh.fib_nh_dev) { +__assign_str (name, f6i->fib6_nh.fib_nh_dev); }else {__assign_str (name,"-" ); }
@@ -75,7 +75,7 @@ TRACE_EVENT(fib6_table_lookup, }else if (f6i) { in6 = (struct in6_addr *)__entry->gw; - *in6 = f6i->fib6_nh.nh_gw; + *in6 = f6i->fib6_nh.fib_nh_gw6; } ),
net/core/filter.c +3 -3
@@ -4748,13 +4748,13 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,return BPF_FIB_LKUP_RET_FRAG_NEEDED ; } -if (f6i->fib6_nh.nh_lwtstate) +if (f6i->fib6_nh.fib_nh_lws)return BPF_FIB_LKUP_RET_UNSUPP_LWT ;if (f6i->fib6_nh.fib_nh_has_gw) - *dst = f6i->fib6_nh.nh_gw; + *dst = f6i->fib6_nh.fib_nh_gw6; - dev = f6i->fib6_nh.nh_dev; + dev = f6i->fib6_nh.fib_nh_dev; params->rt_metric = f6i->fib6_metric;/* xdp and cls_bpf programs are run in RCU-bh so rcu_read_lock_bh is
net/ipv6/addrconf.c +1 -1
@@ -2419,7 +2419,7 @@ static struct fib6_info *addrconf_get_prefix_route(const struct in6_addr *pfx, goto out;for_each_fib6_node_rt_rcu (fn) { -if (rt->fib6_nh.nh_dev->ifindex != dev->ifindex) +if (rt->fib6_nh.fib_nh_dev->ifindex != dev->ifindex)continue ;if (no_gw && rt->fib6_nh.fib_nh_has_gw)continue ;
net/ipv6/ip6_fib.c +2 -2
@@ -2306,12 +2306,12 @@ static int ipv6_route_seq_show(struct seq_file *seq, void *v)#endif if (rt->fib6_nh.fib_nh_has_gw) { flags |=RTF_GATEWAY ; -seq_printf (seq,"%pi6" , &rt->fib6_nh.nh_gw); +seq_printf (seq,"%pi6" , &rt->fib6_nh.fib_nh_gw6); }else {seq_puts (seq,"00000000000000000000000000000000" ); } - dev = rt->fib6_nh.nh_dev; + dev = rt->fib6_nh.fib_nh_dev;seq_printf (seq," %08x %08x %08x %08x %8s\n" , rt->fib6_metric,atomic_read (&rt->fib6_ref),0 , flags, dev ? dev->name :"" );
net/ipv6/ndisc.c +4 -4
@@ -1276,8 +1276,8 @@ static void ndisc_router_discovery(struct sk_buff *skb) rt =rt6_get_dflt_router (net, &ipv6_hdr (skb)->saddr, skb->dev);if (rt) { - neigh =ip6_neigh_lookup (&rt->fib6_nh.nh_gw, - rt->fib6_nh.nh_dev,NULL , + neigh =ip6_neigh_lookup (&rt->fib6_nh.fib_nh_gw6, + rt->fib6_nh.fib_nh_dev,NULL , &ipv6_hdr (skb)->saddr);if (!neigh) { ND_PRINTK(0, err,
@@ -1306,8 +1306,8 @@ static void ndisc_router_discovery(struct sk_buff *skb)return ; } - neigh =ip6_neigh_lookup (&rt->fib6_nh.nh_gw, - rt->fib6_nh.nh_dev,NULL , + neigh =ip6_neigh_lookup (&rt->fib6_nh.fib_nh_gw6, + rt->fib6_nh.fib_nh_dev,NULL , &ipv6_hdr (skb)->saddr);if (!neigh) { ND_PRINTK(0, err,
net/ipv6/route.c +94 -87
529 lines not on this page · raw message
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v3 12/13 net: Add fib_nh_common and update fib_nh and fib6_nh
In reply to David AhernFrom: David Ahern <[email protected]>
Add fib_nh_common struct with common nexthop attributes. Convert fib_nh and fib6_nh to use it. Use macros to move existing fib_nh_* references to the new nh_common.nhc_*.
--- include/net/ip6_fib.h | 10 ++-------- include/net/ip_fib.h | 41 +++++++++++++++++++++++++++++++---------- net/ipv4/fib_semantics.c | 7 ++++++- net/ipv6/route.c | 3 +++ 4 files changed, 42 insertions(+), 19 deletions(-)
include/net/ip6_fib.h +2 -8
@@ -19,6 +19,7 @@#include <linux/notifier.h> #include <net/dst.h> #include <net/flow.h> +#include <net/ip_fib.h> #include <net/netlink.h> #include <net/inetpeer.h> #include <net/fib_notifier.h>
@@ -125,14 +126,7 @@ struct rt6_exception {#define FIB6_MAX_DEPTH 5struct fib6_nh { -struct in6_addr fib_nh_gw6; -bool fib_nh_has_gw; -struct net_device *fib_nh_dev; -struct lwtunnel_state *fib_nh_lws; - -unsigned int fib_nh_flags; -atomic_t fib_nh_upper_bound; -int fib_nh_weight; +struct fib_nh_common nh_common; };struct fib6_info {
include/net/ip_fib.h +31 -10
58 lines not on this page · raw message
net/ipv4/fib_semantics.c +6 -1
@@ -468,6 +468,8 @@ int fib_nh_init(struct net *net, struct fib_nh *nh, {int err = -ENOMEM ; + nh->fib_nh_family =AF_INET ; + nh->nh_pcpu_rth_output = alloc_percpu(struct rtable __rcu *);if (!nh->nh_pcpu_rth_output) goto err_out;
@@ -490,7 +492,10 @@ int fib_nh_init(struct net *net, struct fib_nh *nh, } nh->fib_nh_oif = cfg->fc_oif; - nh->fib_nh_gw4 = cfg->fc_gw; +if (cfg->fc_gw) { + nh->fib_nh_gw4 = cfg->fc_gw; + nh->fib_nh_has_gw =1 ; + } nh->fib_nh_flags = cfg->fc_flags;#ifdef CONFIG_IP_ROUTE_CLASSID
net/ipv6/route.c +3 -0
@@ -2906,6 +2906,8 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh,int addr_type;int err; + fib6_nh->fib_nh_family =AF_INET6 ; + err = -ENODEV ;if (cfg->fc_ifindex) { dev =dev_get_by_index (net, cfg->fc_ifindex);
@@ -2999,6 +3001,7 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, set_dev: fib6_nh->fib_nh_dev = dev; + fib6_nh->fib_nh_oif = dev->ifindex; err =0 ; out:if (idev)
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v3 3/13 ipv4: Create init helper for fib_nh
In reply to David AhernFrom: David Ahern <[email protected]>
Consolidate the fib_nh initialization which is duplicated between fib_create_info for single path and fib_get_nhs for multipath. Export the helper to allow for use with nexthop objects in the future.
--- include/net/ip_fib.h | 4 ++ net/ipv4/fib_semantics.c | 180 ++++++++++++++++++++++++----------------------- 2 files changed, 95 insertions(+), 89 deletions(-)
include/net/ip_fib.h +4 -0
@@ -416,6 +416,10 @@ void fib_select_multipath(struct fib_result *res, int hash);void fib_select_path (struct net *net,struct fib_result *res,struct flowi4 *fl4,const struct sk_buff *skb); +int fib_nh_init (struct net *net,struct fib_nh *fib_nh, +struct fib_config *cfg,int nh_weight, +struct netlink_ext_ack *extack); +/* Exported by fib_trie.c */ void fib_trie_init (void );struct fib_table *fib_trie_table (u32 id,struct fib_table *alias);
net/ipv4/fib_semantics.c +91 -89
227 lines not on this page · raw message
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v3 4/13 ipv4: Create cleanup helper for fib_nh
In reply to David AhernFrom: David Ahern <[email protected]>
Move the fib_nh cleanup code from free_fib_info_rcu into a new helper, fib_nh_release. Move classid accounting into fib_nh_release which is called per fib_nh to make accounting symmetrical with fib_nh_init. Export the helper to allow for use with nexthop objects in the future.
--- include/net/ip_fib.h | 1 + net/ipv4/fib_semantics.c | 29 +++++++++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-)
include/net/ip_fib.h +1 -0
@@ -419,6 +419,7 @@ void fib_select_path(struct net *net, struct fib_result *res,int fib_nh_init (struct net *net,struct fib_nh *fib_nh,struct fib_config *cfg,int nh_weight,struct netlink_ext_ack *extack); +void fib_nh_release (struct net *net,struct fib_nh *fib_nh);/* Exported by fib_trie.c */ void fib_trie_init (void );
net/ipv4/fib_semantics.c +17 -12
@@ -204,18 +204,28 @@ static void rt_fibinfo_free_cpus(struct rtable __rcu * __percpu *rtp)free_percpu (rtp); } +void fib_nh_release (struct net *net,struct fib_nh *fib_nh) +{ +#ifdef CONFIG_IP_ROUTE_CLASSID +if (fib_nh->nh_tclassid) + net->ipv4.fib_num_tclassid_users--; +#endif +if (fib_nh->nh_dev) +dev_put (fib_nh->nh_dev); + +lwtstate_put (fib_nh->nh_lwtstate); +free_nh_exceptions (fib_nh); +rt_fibinfo_free_cpus (fib_nh->nh_pcpu_rth_output); +rt_fibinfo_free (&fib_nh->nh_rth_input); +} +/* Release a nexthop info record */ static void free_fib_info_rcu (struct rcu_head *head) { struct fib_info *fi = container_of(head, struct fib_info, rcu);change_nexthops (fi) { -if (nexthop_nh->nh_dev) -dev_put (nexthop_nh->nh_dev); -lwtstate_put (nexthop_nh->nh_lwtstate); -free_nh_exceptions (nexthop_nh); -rt_fibinfo_free_cpus (nexthop_nh->nh_pcpu_rth_output); -rt_fibinfo_free (&nexthop_nh->nh_rth_input); +fib_nh_release (fi->fib_net, nexthop_nh); }endfor_nexthops (fi);ip_fib_metrics_put (fi->fib_metrics);
@@ -230,12 +240,7 @@ void free_fib_info(struct fib_info *fi)return ; } fib_info_cnt--; -#ifdef CONFIG_IP_ROUTE_CLASSID -change_nexthops (fi) { -if (nexthop_nh->nh_tclassid) - fi->fib_net->ipv4.fib_num_tclassid_users--; - }endfor_nexthops (fi); -#endif +call_rcu (&fi->rcu, free_fib_info_rcu); }EXPORT_SYMBOL_GPL (free_fib_info);
Signature · 1 line
2.11.0
David Ahern
maintainerv3 cover net: Move fib_nh and fib6_nh to a common struct
From: David Ahern <[email protected]>
First set of three with the end goal of enabling IPv6 gateways with IPv4 routes.
This set refactors ipv4 and ipv6 code to create init and release helpers for each protocol and moving common elements to a fib_nh_common struct.
v3
- split the reject setting into 2 with helper to the checks. This avoids changing cfg->fc_flags in fib6_nh_init
v2
- addressed Ido's comments: cleanup on failure path in nh_init helpers, ordering in fib6_nh_release, and removal of RTF_GATEWAY from fib6_info uses in mlxsw
David Ahern (13):
ipv4: Define fib_get_nhs when CONFIG_IP_ROUTE_MULTIPATH is disabled
ipv4: Move IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN to helper
ipv4: Create init helper for fib_nh
ipv4: Create cleanup helper for fib_nh
ipv6: Create init helper for fib6_nh
ipv6: Create cleanup helper for fib6_nh
ipv6: Move gateway checks to a fib6_nh setting
ipv6: Refactor fib6_ignore_linkdown
ipv6: Change rt6_add_nexthop and rt6_nexthop_info to take fib6_nh
ipv4: Rename fib_nh entries
ipv6: Rename fib6_nh entries
net: Add fib_nh_common and update fib_nh and fib6_nh
net: Use common nexthop init and release helpers
drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 12 +- .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 60 +-- drivers/net/ethernet/rocker/rocker_ofdpa.c | 10 +- include/linux/inetdevice.h | 14 + include/net/addrconf.h | 8 + include/net/ip6_fib.h | 18 +- include/net/ip6_route.h | 12 +- include/net/ip_fib.h | 58 ++- include/trace/events/fib.h | 7 +- include/trace/events/fib6.h | 6 +- net/core/filter.c | 16 +- net/ipv4/fib_frontend.c | 10 +- net/ipv4/fib_semantics.c | 473 +++++++++++---------- net/ipv4/fib_trie.c | 14 +- net/ipv4/route.c | 18 +- net/ipv6/addrconf.c | 27 +- net/ipv6/ip6_fib.c | 18 +- net/ipv6/ndisc.c | 8 +- net/ipv6/route.c | 456 +++++++++++--------- 19 files changed, 676 insertions(+), 569 deletions(-)
Signature · 1 line
2.11.0
Re: [PATCH v3 net-next 03/13] ipv4: Create init helper for fib_nh
In reply to David AhernQuoted 8 lines · David Ahern
From: David Ahern <[email protected]>
Consolidate the
fib_nhinitialization which is duplicated betweenfib_create_infofor single path andfib_get_nhsfor multipath. Export the helper to allow for use with nexthop objects in the future.Signed-off-by David Ahern <[email protected]>
One comment below.
Quoted 28 lines
net/ipv4/fib_semantics.c +28
-0+int fib_nh_init (struct net *net,struct fib_nh *nh, +struct fib_config *cfg,int nh_weight, +struct netlink_ext_ack *extack) +{ +int err = -ENOMEM ; + + nh->nh_pcpu_rth_output = alloc_percpu(struct rtable __rcu *); +if (!nh->nh_pcpu_rth_output) + goto err_out; + +if (cfg->fc_encap) { +struct lwtunnel_state *lwtstate; + + err = -EINVAL ; +if (cfg->fc_encap_type ==LWTUNNEL_ENCAP_NONE ) { +NL_SET_ERR_MSG (extack,"LWT encap type not specified" ); + goto lwt_failure; + } + err =lwtunnel_build_state (cfg->fc_encap_type, + cfg->fc_encap,AF_INET , cfg, + &lwtstate, extack); +if (err) + goto lwt_failure; + + nh->nh_lwtstate =lwtstate_get (lwtstate); + } + + nh->nh_oif = cfg->fc_oif;
net/ipv4/fib_semantics.c static int fib_detect_death(struct fib_info *fi, int order, · line 497
Quoted 10 lines
net/ipv4/fib_semantics.c +10
-0+ nh->nh_gw = cfg->fc_gw; + nh->nh_flags = cfg->fc_flags; + +#ifdef CONFIG_IP_ROUTE_CLASSID + nh->nh_tclassid = cfg->fc_flow; +if (nh->nh_tclassid) + net->ipv4.fib_num_tclassid_users++; +#endif +#ifdef CONFIG_IP_ROUTE_MULTIPATH + nh->nh_weight = nh_weight;
After this series 'nhc_weight' is always defined in the nexthop struct because it is shared with IPv6 which does not have a corresponding Kconfig. This ifdef can be removed from here and probably from a few other places as well.
Quoted 9 lines
net/ipv4/fib_semantics.c +9
-0+#endif +return 0 ; + +lwt_failure: +rt_fibinfo_free_cpus (nh->nh_pcpu_rth_output); + nh->nh_pcpu_rth_output =NULL ; +err_out: +return err; +}
Re: [PATCH v3 net-next 05/13] ipv6: Create init helper for fib6_nh
In reply to David AhernQuoted 11 lines · David Ahern
From: David Ahern <[email protected]>
Similar to IPv4, consolidate the
fib6_nhinitialization into a helper. As a new standalone function, add a cleanup path to put lwtstate on error.To avoid modifying
fib6_configflags, move the reject check to a helper that is invoked once byfib6_nh_initto reset the device and then again inip6_route_info_createto set thefib6_flags.Signed-off-by David Ahern <[email protected]>
Re: [PATCH v3 net-next 06/13] ipv6: Create cleanup helper for fib6_nh
In reply to David AhernQuoted 5 lines · David Ahern
From: David Ahern <[email protected]>
Move the
fib6_nhcleanup code to a new helper,fib6_nh_release.Signed-off-by David Ahern <[email protected]>
Re: [PATCH v3 net-next 07/13] ipv6: Move gateway checks to a fib6_nh setting
In reply to David AhernQuoted 7 lines · David Ahern
From: David Ahern <[email protected]>
The gateway setting is not per
fib6_infoentry but per-fib6_nh. Add a newfib_nh_has_gwflag tofib6_nhand convert references toRTF_GATEWAYto the new flag. For IPv6 address the flag is cheaper than checking thatnh_gwis non-0 like IPv4 does.
Quoted 5 lines
While this increases
fib6_nhby 8-bytes, the effective allocation size of afib6_infois unchanged. The 8 bytes is recovered later with afib_nh_commonchange.Signed-off-by David Ahern <[email protected]>
Re: [PATCH v3 net-next 12/13] net: Add fib_nh_common and update fib_nh and fib6_nh
In reply to David AhernQuoted 7 lines · David Ahern
From: David Ahern <[email protected]>
Add
fib_nh_commonstruct with common nexthop attributes. Convertfib_nhandfib6_nhto use it. Use macros to move existing fib_nh_* references to the new nh_common.nhc_*.Signed-off-by David Ahern <[email protected]>
Re: [PATCH v3 net-next 13/13] net: Use common nexthop init and release helpers
In reply to David AhernQuoted 8 lines · David Ahern
From: David Ahern <[email protected]>
With
fib_nh_commonin place, move common initialization and release code into helpers used by both ipv4 and ipv6. For the moment, the init is just the lwt encap and the release is both the netdev reference and the the lwt state reference. More will be added later.Signed-off-by David Ahern <[email protected]>
Re: [PATCH v3 net-next 13/13] net: Use common nexthop init and release helpers
In reply to David AhernQuoted 96 lines · David Ahern
From: David Ahern <[email protected]>
With
fib_nh_commonin place, move common initialization and release code into helpers used by both ipv4 and ipv6. For the moment, the init is just the lwt encap and the release is both the netdev reference and the the lwt state reference. More will be added later.Signed-off-by David Ahern <[email protected]>--- include/net/ip_fib.h | 4 ++++ net/ipv4/fib_semantics.c | 60 +++++++++++++++++++++++++++++++----------------- net/ipv6/route.c | 21 ++++------------- 3 files changed, 48 insertions(+), 37 deletions(-)include/net/ip_fib.h +4
-0@@ -441,6 +441,10 @@ int fib_nh_init(struct net *net, struct fib_nh *fib_nh, struct fib_config *cfg, int nh_weight, struct netlink_ext_ack *extack);void fib_nh_release (struct net *net,struct fib_nh *fib_nh); +int fib_nh_common_init (struct fib_nh_common *nhc,struct nlattr *fc_encap, +u16 fc_encap_type,void *cfg,gfp_t gfp_flags, +struct netlink_ext_ack *extack); +void fib_nh_common_release (struct fib_nh_common *nhc);/* Exported by fib_trie.c */ void fib_trie_init (void );net/ipv4/fib_semantics.c +34
-5@@ -204,16 +204,22 @@ static void rt_fibinfo_free_cpus(struct rtable __rcu * __percpu *rtp)free_percpu (rtp); } +void fib_nh_common_release (struct fib_nh_common *nhc) +{ +if (nhc->nhc_dev) +dev_put (nhc->nhc_dev); + +lwtstate_put (nhc->nhc_lwtstate); +} +EXPORT_SYMBOL_GPL (fib_nh_common_release); +void fib_nh_release (struct net *net,struct fib_nh *fib_nh) {#ifdef CONFIG_IP_ROUTE_CLASSID if (fib_nh->nh_tclassid) net->ipv4.fib_num_tclassid_users--;#endif -if (fib_nh->fib_nh_dev) -dev_put (fib_nh->fib_nh_dev); - -lwtstate_put (fib_nh->fib_nh_lws); +fib_nh_common_release (&fib_nh->nh_common);free_nh_exceptions (fib_nh);rt_fibinfo_free_cpus (fib_nh->nh_pcpu_rth_output);rt_fibinfo_free (&fib_nh->nh_rth_input);@@ -462,6 +468,30 @@ static int fib_detect_death(struct fib_info *fi, int order,return 1 ; } +int fib_nh_common_init (struct fib_nh_common *nhc,struct nlattr *encap, +u16 encap_type,void *cfg,gfp_t gfp_flags, +struct netlink_ext_ack *extack) +{ +if (encap) { +struct lwtunnel_state *lwtstate; +int err; + +if (encap_type ==LWTUNNEL_ENCAP_NONE ) { +NL_SET_ERR_MSG (extack,"LWT encap type not specified" ); +return -EINVAL ; + } + err =lwtunnel_build_state (encap_type, encap, nhc->nhc_family, + cfg, &lwtstate, extack); +if (err) +return err; + + nhc->nhc_lwtstate =lwtstate_get (lwtstate); + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (fib_nh_common_init); +int fib_nh_init (struct net *net,struct fib_nh *nh,struct fib_config *cfg,int nh_weight,struct netlink_ext_ack *extack)@@ -474,22 +504,10 @@ int fib_nh_init(struct net *net, struct fib_nh *nh,if (!nh->nh_pcpu_rth_output) goto err_out; -if (cfg->fc_encap) {
net/ipv4/fib_semantics.c int fib_nh_init(struct net *net, struct fib_nh *nh, · line 487
Quoted 10 lines
net/ipv4/fib_semantics.c +0
-10-struct lwtunnel_state *lwtstate; - - err = -EINVAL ; -if (cfg->fc_encap_type ==LWTUNNEL_ENCAP_NONE ) { -NL_SET_ERR_MSG (extack,"LWT encap type not specified" ); - goto lwt_failure; - } - err =lwtunnel_build_state (cfg->fc_encap_type, - cfg->fc_encap,AF_INET , cfg, - &lwtstate, extack);
Init of nhc_family should have been part of this patch instead of previous one, but it's not a big deal.
patch 5 isn't pretty still and you didn't answer my question why pointer to fib6_flags is worse than duplicated check. But it's ok to me in this shape, so for the set:
Re: [PATCH v3 net-next 13/13] net: Use common nexthop init and release helpers
Quoted 3 lines · Alexei Starovoitov
patch 5 isn't pretty still and you didn't answer my question why pointer to
fib6_flagsis worse than duplicated check.
fib6_flags (prefix flags) has nothing to do with a fib6_nh initialization, and I do want to add a 6th input argument for something that is used in only 1 of 2 paths and even the 1 path is a highly unlikely.
David Miller
maintainerFrom: David Ahern <[email protected]>
Date: Wed, 27 Mar 2019 20:53:45 -0700
Quoted 9 lines
From: David Ahern <[email protected]>
First set of three with the end goal of enabling IPv6 gateways with IPv4 routes.
This set refactors ipv4 and ipv6 code to create init and release helpers for each protocol and moving common elements to a
fib_nh_commonstruct.
Quoted 8 lines
v3
- split the reject setting into 2 with helper to the checks. This avoids changingcfg->fc_flagsinfib6_nh_initv2
- addressed Ido's comments: cleanup on failure path innh_inithelpers, ordering infib6_nh_release, and removal ofRTF_GATEWAYfromfib6_infouses in mlxsw
Looks great, series applied, thanks David.