net: Add helper function to compare inetpeer addresses

[firefly-linux-kernel-4.4.55.git] / include / net / inetpeer.h

diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index d5332ddcea3f3b58fb7f38254d6c8a7e84de21eb..9d9b3446731dde34e0d5ed2721be32a67f894a6e 100644 (file)
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -65,69 +65,33 @@ 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->addr.a4 = ip;
+       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->addr.a4;
 }
 
-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->addr.in6 = *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->addr.in6;
 }
 
 /* can be called with or without local BH being disabled */
@@ -157,18 +121,26 @@ static inline struct inet_peer *inet_getpeer_v6(struct inet_peer_base *base,
        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 = (a->family == AF_INET ? 1 : 4);
+
+       for (i = 0; i < n; i++) {
+               if (a->addr.a6[i] == b->addr.a6[i])
+                       continue;
+               if ((__force u32)a->addr.a6[i] < (__force u32)b->addr.a6[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 */