net/ipv6: move expires into rt6_info

Add expires to rt6_info for FIB entries, and add fib6 helpers to
manage it. Data path use of dst.expires remains.

The transition is fairly straightforward: when working with fib entries,
rt->dst.expires is just rt->expires, rt6_clean_expires is replaced with
fib6_clean_expires, rt6_set_expires becomes fib6_set_expires, and
rt6_check_expired becomes fib6_check_expired, where the fib6 versions
are added by this patch.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 1f8dc9d12abb7b14a1f5041949a6ad0574194244..c73b985734f5fd211a2d97e443baef0abed502b6 100644 (file)
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -179,6 +179,7 @@ struct rt6_info {
                                        should_flush:1,
                                        unused:6;
 
+       unsigned long                   expires;
        struct dst_metrics              *fib6_metrics;
 #define fib6_pmtu              fib6_metrics->metrics[RTAX_MTU-1]
        struct fib6_nh                  fib6_nh;
@@ -197,6 +198,26 @@ static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst)
        return ((struct rt6_info *)dst)->rt6i_idev;
 }
 
+static inline void fib6_clean_expires(struct rt6_info *f6i)
+{
+       f6i->rt6i_flags &= ~RTF_EXPIRES;
+       f6i->expires = 0;
+}
+
+static inline void fib6_set_expires(struct rt6_info *f6i,
+                                   unsigned long expires)
+{
+       f6i->expires = expires;
+       f6i->rt6i_flags |= RTF_EXPIRES;
+}
+
+static inline bool fib6_check_expired(const struct rt6_info *f6i)
+{
+       if (f6i->rt6i_flags & RTF_EXPIRES)
+               return time_after(jiffies, f6i->expires);
+       return false;
+}
+
 static inline void rt6_clean_expires(struct rt6_info *rt)
 {
        rt->rt6i_flags &= ~RTF_EXPIRES;
@@ -211,11 +232,9 @@ static inline void rt6_set_expires(struct rt6_info *rt, unsigned long expires)
 
 static inline void rt6_update_expires(struct rt6_info *rt0, int timeout)
 {
-       struct rt6_info *rt;
+       if (!(rt0->rt6i_flags & RTF_EXPIRES) && rt0->from)
+               rt0->dst.expires = rt0->from->expires;
 
-       for (rt = rt0; rt && !(rt->rt6i_flags & RTF_EXPIRES); rt = rt->from);
-       if (rt && rt != rt0)
-               rt0->dst.expires = rt->dst.expires;
        dst_set_expires(&rt0->dst, timeout);
        rt0->rt6i_flags |= RTF_EXPIRES;
 }

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 483c8772e856ea94ebaf5035bb848c77871208a7..a156f1a0b1a783b011b5663fa4da4a4da18e1309 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1190,7 +1190,7 @@ cleanup_prefix_route(struct inet6_ifaddr *ifp, unsigned long expires, bool del_r
                        ip6_del_rt(dev_net(ifp->idev->dev), rt);
                else {
                        if (!(rt->rt6i_flags & RTF_EXPIRES))
-                               rt6_set_expires(rt, expires);
+                               fib6_set_expires(rt, expires);
                        ip6_rt_put(rt);
                }
        }
@@ -2672,9 +2672,9 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao)
                                rt = NULL;
                        } else if (addrconf_finite_timeout(rt_expires)) {
                                /* not infinity */
-                               rt6_set_expires(rt, jiffies + rt_expires);
+                               fib6_set_expires(rt, jiffies + rt_expires);
                        } else {
-                               rt6_clean_expires(rt);
+                               fib6_clean_expires(rt);
                        }
                } else if (valid_lft) {
                        clock_t expires = 0;

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 0d94c56c3e41d28d1cfa2a8bfe4d7080be98ad10..f25f4d9831e89de6bcd8a8669608bbef4f86dbab 100644 (file)
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -906,9 +906,9 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt,
                                if (!(iter->rt6i_flags & RTF_EXPIRES))
                                        return -EEXIST;
                                if (!(rt->rt6i_flags & RTF_EXPIRES))
-                                       rt6_clean_expires(iter);
+                                       fib6_clean_expires(iter);
                                else
-                                       rt6_set_expires(iter, rt->dst.expires);
+                                       fib6_set_expires(iter, rt->expires);
                                fib6_metric_set(iter, RTAX_MTU, rt->fib6_pmtu);
                                return -EEXIST;
                        }
@@ -2003,8 +2003,8 @@ static int fib6_age(struct rt6_info *rt, void *arg)
         *      Routes are expired even if they are in use.
         */
 
-       if (rt->rt6i_flags & RTF_EXPIRES && rt->dst.expires) {
-               if (time_after(now, rt->dst.expires)) {
+       if (rt->rt6i_flags & RTF_EXPIRES && rt->expires) {
+               if (time_after(now, rt->expires)) {
                        RT6_TRACE("expiring %p\n", rt);
                        return -1;
                }

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index b058ea9ecec0219d7edb159d8bb9844c40366990..e4d9eea921396e52b4cc2e447c9d494dd8693095 100644 (file)
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1318,7 +1318,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
        }
 
        if (rt)
-               rt6_set_expires(rt, jiffies + (HZ * lifetime));
+               fib6_set_expires(rt, jiffies + (HZ * lifetime));
        if (in6_dev->cnf.accept_ra_min_hop_limit < 256 &&
            ra_msg->icmph.icmp6_hop_limit) {
                if (in6_dev->cnf.accept_ra_min_hop_limit <= ra_msg->icmph.icmp6_hop_limit) {

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 62aafd06c35f88baa10c98aece39dd0df6c570a9..f6ca55d21fac35b8b10879a91cf350fffcff811b 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -435,7 +435,7 @@ static bool rt6_check_expired(const struct rt6_info *rt)
                        return true;
        } else if (rt->from) {
                return rt->dst.obsolete != DST_OBSOLETE_FORCE_CHK ||
-                       rt6_check_expired(rt->from);
+                       fib6_check_expired(rt->from);
        }
        return false;
 }
@@ -687,7 +687,7 @@ static struct rt6_info *find_match(struct rt6_info *rt, int oif, int strict,
            !(strict & RT6_LOOKUP_F_IGNORE_LINKSTATE))
                goto out;
 
-       if (rt6_check_expired(rt))
+       if (fib6_check_expired(rt))
                goto out;
 
        m = rt6_score_route(rt, oif, strict);
@@ -871,9 +871,9 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len,
 
        if (rt) {
                if (!addrconf_finite_timeout(lifetime))
-                       rt6_clean_expires(rt);
+                       fib6_clean_expires(rt);
                else
-                       rt6_set_expires(rt, jiffies + HZ * lifetime);
+                       fib6_set_expires(rt, jiffies + HZ * lifetime);
 
                ip6_rt_put(rt);
        }
@@ -2383,7 +2383,7 @@ restart:
        for_each_fib6_node_rt_rcu(fn) {
                if (rt->fib6_nh.nh_flags & RTNH_F_DEAD)
                        continue;
-               if (rt6_check_expired(rt))
+               if (fib6_check_expired(rt))
                        continue;
                if (rt->rt6i_flags & RTF_REJECT)
                        break;
@@ -2909,10 +2909,10 @@ static struct rt6_info *ip6_route_info_create(struct fib6_config *cfg,
                goto out;
 
        if (cfg->fc_flags & RTF_EXPIRES)
-               rt6_set_expires(rt, jiffies +
+               fib6_set_expires(rt, jiffies +
                                clock_t_to_jiffies(cfg->fc_expires));
        else
-               rt6_clean_expires(rt);
+               fib6_clean_expires(rt);
 
        if (cfg->fc_protocol == RTPROT_UNSPEC)
                cfg->fc_protocol = RTPROT_BOOT;
@@ -4599,8 +4599,10 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb,
                        goto nla_put_failure;
        }
 
-       if (rt->rt6i_flags & RTF_EXPIRES && dst)
-               expires = dst->expires - jiffies;
+       if (rt->rt6i_flags & RTF_EXPIRES) {
+               expires = dst ? dst->expires : rt->expires;
+               expires -= jiffies;
+       }
 
        if (rtnl_put_cacheinfo(skb, dst, 0, expires, dst ? dst->error : 0) < 0)
                goto nla_put_failure;