These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / net / inetpeer.h

diff --git a/kernel/include/net/inetpeer.h b/kernel/include/net/inetpeer.h
index d5332dd..235c781 100644 (file)
--- a/kernel/include/net/inetpeer.h
+++ b/kernel/include/net/inetpeer.h
@@ -15,16 +15,20 @@
 #include <net/ipv6.h>
 #include <linux/atomic.h>
 
-struct inetpeer_addr_base {
-       union {
-               __be32                  a4;
-               __be32                  a6[4];
-               struct in6_addr         in6;
-       };
+/* IPv4 address key for cache lookups */
+struct ipv4_addr_key {
+       __be32  addr;
+       int     vif;
 };
 
+#define INETPEER_MAXKEYSZ   (sizeof(struct in6_addr) / sizeof(u32))
+
 struct inetpeer_addr {
-       struct inetpeer_addr_base       addr;
+       union {
+               struct ipv4_addr_key    a4;
+               struct in6_addr         a6;
+               u32                     key[INETPEER_MAXKEYSZ];
+       };
        __u16                           family;
 };
 
@@ -65,69 +69,34 @@ struct inet_peer_base {
        int                     total;
 };
 
-#define INETPEER_BASE_BIT      0x1UL
-
-static inline struct inet_peer *inetpeer_ptr(unsigned long val)
-{
-       BUG_ON(val & INETPEER_BASE_BIT);
-       return (struct inet_peer *) val;
-}
+void inet_peer_base_init(struct inet_peer_base *);
 
-static inline struct inet_peer_base *inetpeer_base_ptr(unsigned long val)
-{
-       if (!(val & INETPEER_BASE_BIT))
-               return NULL;
-       val &= ~INETPEER_BASE_BIT;
-       return (struct inet_peer_base *) val;
-}
+void inet_initpeers(void) __init;
 
-static inline bool inetpeer_ptr_is_peer(unsigned long val)
-{
-       return !(val & INETPEER_BASE_BIT);
-}
+#define INETPEER_METRICS_NEW   (~(u32) 0)
 
-static inline void __inetpeer_ptr_set_peer(unsigned long *val, struct inet_peer *peer)
+static inline void inetpeer_set_addr_v4(struct inetpeer_addr *iaddr, __be32 ip)
 {
-       /* This implicitly clears INETPEER_BASE_BIT */
-       *val = (unsigned long) peer;
+       iaddr->a4.addr = ip;
+       iaddr->a4.vif = 0;
+       iaddr->family = AF_INET;
 }
 
-static inline bool inetpeer_ptr_set_peer(unsigned long *ptr, struct inet_peer *peer)
+static inline __be32 inetpeer_get_addr_v4(struct inetpeer_addr *iaddr)
 {
-       unsigned long val = (unsigned long) peer;
-       unsigned long orig = *ptr;
-
-       if (!(orig & INETPEER_BASE_BIT) ||
-           cmpxchg(ptr, orig, val) != orig)
-               return false;
-       return true;
+       return iaddr->a4.addr;
 }
 
-static inline void inetpeer_init_ptr(unsigned long *ptr, struct inet_peer_base *base)
+static inline void inetpeer_set_addr_v6(struct inetpeer_addr *iaddr,
+                                       struct in6_addr *in6)
 {
-       *ptr = (unsigned long) base | INETPEER_BASE_BIT;
+       iaddr->a6 = *in6;
+       iaddr->family = AF_INET6;
 }
 
-static inline void inetpeer_transfer_peer(unsigned long *to, unsigned long *from)
+static inline struct in6_addr *inetpeer_get_addr_v6(struct inetpeer_addr *iaddr)
 {
-       unsigned long val = *from;
-
-       *to = val;
-       if (inetpeer_ptr_is_peer(val)) {
-               struct inet_peer *peer = inetpeer_ptr(val);
-               atomic_inc(&peer->refcnt);
-       }
-}
-
-void inet_peer_base_init(struct inet_peer_base *);
-
-void inet_initpeers(void) __init;
-
-#define INETPEER_METRICS_NEW   (~(u32) 0)
-
-static inline bool inet_metrics_new(const struct inet_peer *p)
-{
-       return p->metrics[RTAX_LOCK-1] == INETPEER_METRICS_NEW;
+       return &iaddr->a6;
 }
 
 /* can be called with or without local BH being disabled */
@@ -137,11 +106,12 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base,
 
 static inline struct inet_peer *inet_getpeer_v4(struct inet_peer_base *base,
                                                __be32 v4daddr,
-                                               int create)
+                                               int vif, int create)
 {
        struct inetpeer_addr daddr;
 
-       daddr.addr.a4 = v4daddr;
+       daddr.a4.addr = v4daddr;
+       daddr.a4.vif = vif;
        daddr.family = AF_INET;
        return inet_getpeer(base, &daddr, create);
 }
@@ -152,23 +122,36 @@ static inline struct inet_peer *inet_getpeer_v6(struct inet_peer_base *base,
 {
        struct inetpeer_addr daddr;
 
-       daddr.addr.in6 = *v6daddr;
+       daddr.a6 = *v6daddr;
        daddr.family = AF_INET6;
        return inet_getpeer(base, &daddr, create);
 }
 
+static inline int inetpeer_addr_cmp(const struct inetpeer_addr *a,
+                                   const struct inetpeer_addr *b)
+{
+       int i, n;
+
+       if (a->family == AF_INET)
+               n = sizeof(a->a4) / sizeof(u32);
+       else
+               n = sizeof(a->a6) / sizeof(u32);
+
+       for (i = 0; i < n; i++) {
+               if (a->key[i] == b->key[i])
+                       continue;
+               if (a->key[i] < b->key[i])
+                       return -1;
+               return 1;
+       }
+
+       return 0;
+}
+
 /* can be called from BH context or outside */
 void inet_putpeer(struct inet_peer *p);
 bool inet_peer_xrlim_allow(struct inet_peer *peer, int timeout);
 
 void inetpeer_invalidate_tree(struct inet_peer_base *);
 
-/*
- * temporary check to make sure we dont access rid, tcp_ts,
- * tcp_ts_stamp if no refcount is taken on inet_peer
- */
-static inline void inet_peer_refcheck(const struct inet_peer *p)
-{
-       WARN_ON_ONCE(atomic_read(&p->refcnt) <= 0);
-}
 #endif /* _NET_INETPEER_H */