ipv4: Move cached routes to fib_nh_common

While the cached routes, nh_pcpu_rth_output and nh_rth_input, are IPv4
specific, a later patch wants to make them accessible for IPv6 nexthops
with IPv4 routes using a fib6_nh. Move the cached routes from fib_nh to
fib_nh_common and update references.

Initialization of the cached entries is moved to fib_nh_common_init,
and free is moved to fib_nh_common_release.

Change in location only, from fib_nh up to fib_nh_common; no functional
change intended.

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

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 772a9e61bd84a54ca4c67cae25449f2bb0abbd55..659c5081c40b209b980082e893b7ded54ba398d2 100644 (file)
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -96,6 +96,10 @@ struct fib_nh_common {
 
        int                     nhc_weight;
        atomic_t                nhc_upper_bound;
+
+       /* v4 specific, but allows fib6_nh with v4 routes */
+       struct rtable __rcu * __percpu *nhc_pcpu_rth_output;
+       struct rtable __rcu     *nhc_rth_input;
 };
 
 struct fib_nh {
@@ -107,8 +111,6 @@ struct fib_nh {
 #endif
        __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;
 #define fib_nh_family          nh_common.nhc_family
 #define fib_nh_dev             nh_common.nhc_dev

diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 71c2165a2ce3cb03eddd0f6d5a45bb8b219f2eb8..4402ec6dc426b08cfadf7e3eec002b6df28c5d7e 100644 (file)
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -212,6 +212,8 @@ void fib_nh_common_release(struct fib_nh_common *nhc)
                dev_put(nhc->nhc_dev);
 
        lwtstate_put(nhc->nhc_lwtstate);
+       rt_fibinfo_free_cpus(nhc->nhc_pcpu_rth_output);
+       rt_fibinfo_free(&nhc->nhc_rth_input);
 }
 EXPORT_SYMBOL_GPL(fib_nh_common_release);
 
@@ -223,8 +225,6 @@ void fib_nh_release(struct net *net, struct fib_nh *fib_nh)
 #endif
        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);
 }
 
 /* Release a nexthop info record */
@@ -491,23 +491,35 @@ 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)
 {
+       int err;
+
+       nhc->nhc_pcpu_rth_output = alloc_percpu_gfp(struct rtable __rcu *,
+                                                   gfp_flags);
+       if (!nhc->nhc_pcpu_rth_output)
+               return -ENOMEM;
+
        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 = -EINVAL;
+                       goto lwt_failure;
                }
                err = lwtunnel_build_state(encap_type, encap, nhc->nhc_family,
                                           cfg, &lwtstate, extack);
                if (err)
-                       return err;
+                       goto lwt_failure;
 
                nhc->nhc_lwtstate = lwtstate_get(lwtstate);
        }
 
        return 0;
+
+lwt_failure:
+       rt_fibinfo_free_cpus(nhc->nhc_pcpu_rth_output);
+       nhc->nhc_pcpu_rth_output = NULL;
+       return err;
 }
 EXPORT_SYMBOL_GPL(fib_nh_common_init);
 
@@ -515,18 +527,14 @@ 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;
+       int err;
 
        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;
-
        err = fib_nh_common_init(&nh->nh_common, cfg->fc_encap,
                                 cfg->fc_encap_type, cfg, GFP_KERNEL, extack);
        if (err)
-               goto init_failure;
+               return err;
 
        nh->fib_nh_oif = cfg->fc_oif;
        nh->fib_nh_gw_family = cfg->fc_gw_family;
@@ -546,12 +554,6 @@ int fib_nh_init(struct net *net, struct fib_nh *nh,
        nh->fib_nh_weight = nh_weight;
 #endif
        return 0;
-
-init_failure:
-       rt_fibinfo_free_cpus(nh->nh_pcpu_rth_output);
-       nh->nh_pcpu_rth_output = NULL;
-err_out:
-       return err;
 }
 
 #ifdef CONFIG_IP_ROUTE_MULTIPATH

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 795aed6e47209c003467c98209c256c60a2853a3..662ac9bd956ee73f54ecbbcb8284a3d2ccd56427 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -646,6 +646,7 @@ static void fill_route_from_fnhe(struct rtable *rt, struct fib_nh_exception *fnh
 static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw,
                                  u32 pmtu, bool lock, unsigned long expires)
 {
+       struct fib_nh_common *nhc = &nh->nh_common;
        struct fnhe_hash_bucket *hash;
        struct fib_nh_exception *fnhe;
        struct rtable *rt;
@@ -715,13 +716,13 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw,
                 * stale, so anyone caching it rechecks if this exception
                 * applies to them.
                 */
-               rt = rcu_dereference(nh->nh_rth_input);
+               rt = rcu_dereference(nhc->nhc_rth_input);
                if (rt)
                        rt->dst.obsolete = DST_OBSOLETE_KILL;
 
                for_each_possible_cpu(i) {
                        struct rtable __rcu **prt;
-                       prt = per_cpu_ptr(nh->nh_pcpu_rth_output, i);
+                       prt = per_cpu_ptr(nhc->nhc_pcpu_rth_output, i);
                        rt = rcu_dereference(*prt);
                        if (rt)
                                rt->dst.obsolete = DST_OBSOLETE_KILL;
@@ -1471,13 +1472,14 @@ static bool rt_bind_exception(struct rtable *rt, struct fib_nh_exception *fnhe,
 
 static bool rt_cache_route(struct fib_nh *nh, struct rtable *rt)
 {
+       struct fib_nh_common *nhc = &nh->nh_common;
        struct rtable *orig, *prev, **p;
        bool ret = true;
 
        if (rt_is_input_route(rt)) {
-               p = (struct rtable **)&nh->nh_rth_input;
+               p = (struct rtable **)&nhc->nhc_rth_input;
        } else {
-               p = (struct rtable **)raw_cpu_ptr(nh->nh_pcpu_rth_output);
+               p = (struct rtable **)raw_cpu_ptr(nhc->nhc_pcpu_rth_output);
        }
        orig = *p;
 
@@ -1810,7 +1812,7 @@ static int __mkroute_input(struct sk_buff *skb,
                if (fnhe)
                        rth = rcu_dereference(fnhe->fnhe_rth_input);
                else
-                       rth = rcu_dereference(nh->nh_rth_input);
+                       rth = rcu_dereference(nhc->nhc_rth_input);
                if (rt_cache_valid(rth)) {
                        skb_dst_set_noref(skb, &rth->dst);
                        goto out;
@@ -2105,10 +2107,8 @@ out:     return err;
        if (res->fi) {
                if (!itag) {
                        struct fib_nh_common *nhc = FIB_RES_NHC(*res);
-                       struct fib_nh *nh;
 
-                       nh = container_of(nhc, struct fib_nh, nh_common);
-                       rth = rcu_dereference(nh->nh_rth_input);
+                       rth = rcu_dereference(nhc->nhc_rth_input);
                        if (rt_cache_valid(rth)) {
                                skb_dst_set_noref(skb, &rth->dst);
                                err = 0;
@@ -2337,7 +2337,7 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
                                do_cache = false;
                                goto add;
                        }
-                       prth = raw_cpu_ptr(nh->nh_pcpu_rth_output);
+                       prth = raw_cpu_ptr(nhc->nhc_pcpu_rth_output);
                }
                rth = rcu_dereference(*prth);
                if (rt_cache_valid(rth) && dst_hold_safe(&rth->dst))