inet: Initialize per-netns inetpeer roots in net/ipv{4,6}/route.c

[linux-2.6-block.git] / include / net / inetpeer.h

diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index b94765e38e8074aa5a877c90b395f0bc8cb6bb4a..5a96c8edc5264c2d95f18a662e79a5eadeefd5cf 100644 (file)
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -40,7 +40,10 @@ struct inet_peer {
        u32                     pmtu_orig;
        u32                     pmtu_learned;
        struct inetpeer_addr_base redirect_learned;
-       struct list_head        gc_list;
+       union {
+               struct list_head        gc_list;
+               struct rcu_head     gc_rcu;
+       };
        /*
         * Once inet_peer is queued for deletion (refcnt == -1), following fields
         * are not available: rid, ip_id_count, tcp_ts, tcp_ts_stamp
@@ -62,6 +65,14 @@ struct inet_peer {
        atomic_t                refcnt;
 };
 
+struct inet_peer_base {
+       struct inet_peer __rcu  *root;
+       seqlock_t               lock;
+       int                     total;
+};
+
+extern void inet_peer_base_init(struct inet_peer_base *);
+
 void                   inet_initpeers(void) __init;
 
 #define INETPEER_METRICS_NEW   (~(u32) 0)
@@ -72,31 +83,38 @@ static inline bool inet_metrics_new(const struct inet_peer *p)
 }
 
 /* can be called with or without local BH being disabled */
-struct inet_peer       *inet_getpeer(const struct inetpeer_addr *daddr, int create);
+struct inet_peer *inet_getpeer(struct net *net,
+                              const struct inetpeer_addr *daddr,
+                              int create);
 
-static inline struct inet_peer *inet_getpeer_v4(__be32 v4daddr, int create)
+static inline struct inet_peer *inet_getpeer_v4(struct net *net,
+                                               __be32 v4daddr,
+                                               int create)
 {
        struct inetpeer_addr daddr;
 
        daddr.addr.a4 = v4daddr;
        daddr.family = AF_INET;
-       return inet_getpeer(&daddr, create);
+       return inet_getpeer(net, &daddr, create);
 }
 
-static inline struct inet_peer *inet_getpeer_v6(const struct in6_addr *v6daddr, int create)
+static inline struct inet_peer *inet_getpeer_v6(struct net *net,
+                                               const struct in6_addr *v6daddr,
+                                               int create)
 {
        struct inetpeer_addr daddr;
 
        *(struct in6_addr *)daddr.addr.a6 = *v6daddr;
        daddr.family = AF_INET6;
-       return inet_getpeer(&daddr, create);
+       return inet_getpeer(net, &daddr, create);
 }
 
 /* can be called from BH context or outside */
 extern void inet_putpeer(struct inet_peer *p);
 extern bool inet_peer_xrlim_allow(struct inet_peer *peer, int timeout);
 
-extern void inetpeer_invalidate_tree(int family);
+extern void __inetpeer_invalidate_tree(struct inet_peer_base *);
+extern void inetpeer_invalidate_tree(struct net *net, int family);
 
 /*
  * temporary check to make sure we dont access rid, ip_id_count, tcp_ts,