net: Use common nexthop init and release helpers

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.

Signed-off-by: David Ahern <dsahern@gmail.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 70548b1a6322057076ba68cea94b4363394c8fdc..12a6d759cf57020284cdb314939a03cb02dab3ee 100644 (file)
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -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);

diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index e9992407863e3feac0740434ffd4b0beb0c8b540..df777af7e278edabed652bc92ae6dce7169cfbbf 100644 (file)
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -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) {
-               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->fib_nh_lws = lwtstate_get(lwtstate);
-       }
+       err = fib_nh_common_init(&nh->nh_common, cfg->fc_encap,
+                                cfg->fc_encap_type, cfg, GFP_KERNEL, extack);
+       if (err)
+               goto init_failure;
 
        nh->fib_nh_oif = cfg->fc_oif;
        if (cfg->fc_gw) {
@@ -508,7 +526,7 @@ int fib_nh_init(struct net *net, struct fib_nh *nh,
 #endif
        return 0;
 
-lwt_failure:
+init_failure:
        rt_fibinfo_free_cpus(nh->nh_pcpu_rth_output);
        nh->nh_pcpu_rth_output = NULL;
 err_out:

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 79ef590b7bc578720e19d3423d313068854b7d24..e0ee30cbd0795a8eaf22017ed0aec98a3bc68aa9 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -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,