inet: refactor inet[6]_lookup functions to take skb

This is a preliminary step to allow fast socket lookup of SO_REUSEPORT
groups.  Doing so with a BPF filter will require access to the
skb in question.  This change plumbs the skb (and offset to payload
data) through the call stack to the listening socket lookup
implementations where it will be used in a following patch.

Signed-off-by: Craig Gallek <kraig@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 21 insertions, 10 deletions

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 47f52d3cd8df..730d856683e5 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -87,6 +87,8 @@ int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
                       u32 banned_flags);
 int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
                     u32 banned_flags);
+int ipv4_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2,
+                         bool match_wildcard);
 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2,
                          bool match_wildcard);
 void addrconf_join_solict(struct net_device *dev, const struct in6_addr *addr);
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h
index b3c28a9dfbf1..28332bdac333 100644
--- a/include/net/inet6_hashtables.h
+++ b/include/net/inet6_hashtables.h
@@ -53,6 +53,7 @@ struct sock *__inet6_lookup_established(struct net *net,
 
 struct sock *inet6_lookup_listener(struct net *net,
                                    struct inet_hashinfo *hashinfo,
+                                   struct sk_buff *skb, int doff,
                                    const struct in6_addr *saddr,
                                    const __be16 sport,
                                    const struct in6_addr *daddr,
@@ -60,6 +61,7 @@ struct sock *inet6_lookup_listener(struct net *net,
 
 static inline struct sock *__inet6_lookup(struct net *net,
                                           struct inet_hashinfo *hashinfo,
+                                          struct sk_buff *skb, int doff,
                                           const struct in6_addr *saddr,
                                           const __be16 sport,
                                           const struct in6_addr *daddr,
@@ -71,12 +73,12 @@ static inline struct sock *__inet6_lookup(struct net *net,
         if (sk)
                 return sk;
 
-        return inet6_lookup_listener(net, hashinfo, saddr, sport,
+        return inet6_lookup_listener(net, hashinfo, skb, doff, saddr, sport,
                                      daddr, hnum, dif);
 }
 
 static inline struct sock *__inet6_lookup_skb(struct inet_hashinfo *hashinfo,
-                                              struct sk_buff *skb,
+                                              struct sk_buff *skb, int doff,
                                               const __be16 sport,
                                               const __be16 dport,
                                               int iif)
@@ -86,13 +88,14 @@ static inline struct sock *__inet6_lookup_skb(struct inet_hashinfo *hashinfo,
         if (sk)
                 return sk;
 
-        return __inet6_lookup(dev_net(skb_dst(skb)->dev), hashinfo,
-                              &ipv6_hdr(skb)->saddr, sport,
+        return __inet6_lookup(dev_net(skb_dst(skb)->dev), hashinfo, skb,
+                              doff, &ipv6_hdr(skb)->saddr, sport,
                               &ipv6_hdr(skb)->daddr, ntohs(dport),
                               iif);
 }
 
 struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo,
+                          struct sk_buff *skb, int doff,
                           const struct in6_addr *saddr, const __be16 sport,
                           const struct in6_addr *daddr, const __be16 dport,
                           const int dif);
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index 554440e7f83d..82403390af58 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -213,6 +213,7 @@ void inet_unhash(struct sock *sk);
 
 struct sock *__inet_lookup_listener(struct net *net,
                                     struct inet_hashinfo *hashinfo,
+                                    struct sk_buff *skb, int doff,
                                     const __be32 saddr, const __be16 sport,
                                     const __be32 daddr,
                                     const unsigned short hnum,
@@ -220,10 +221,11 @@ struct sock *__inet_lookup_listener(struct net *net,
 
 static inline struct sock *inet_lookup_listener(struct net *net,
                 struct inet_hashinfo *hashinfo,
+                struct sk_buff *skb, int doff,
                 __be32 saddr, __be16 sport,
                 __be32 daddr, __be16 dport, int dif)
 {
-        return __inet_lookup_listener(net, hashinfo, saddr, sport,
+        return __inet_lookup_listener(net, hashinfo, skb, doff, saddr, sport,
                                       daddr, ntohs(dport), dif);
 }
 
@@ -299,6 +301,7 @@ static inline struct sock *
 
 static inline struct sock *__inet_lookup(struct net *net,
                                          struct inet_hashinfo *hashinfo,
+                                         struct sk_buff *skb, int doff,
                                          const __be32 saddr, const __be16 sport,
                                          const __be32 daddr, const __be16 dport,
                                          const int dif)
@@ -307,12 +310,13 @@ static inline struct sock *__inet_lookup(struct net *net,
         struct sock *sk = __inet_lookup_established(net, hashinfo,
                                 saddr, sport, daddr, hnum, dif);
 
-        return sk ? : __inet_lookup_listener(net, hashinfo, saddr, sport,
-                                             daddr, hnum, dif);
+        return sk ? : __inet_lookup_listener(net, hashinfo, skb, doff, saddr,
+                                             sport, daddr, hnum, dif);
 }
 
 static inline struct sock *inet_lookup(struct net *net,
                                        struct inet_hashinfo *hashinfo,
+                                       struct sk_buff *skb, int doff,
                                        const __be32 saddr, const __be16 sport,
                                        const __be32 daddr, const __be16 dport,
                                        const int dif)
@@ -320,7 +324,8 @@ static inline struct sock *inet_lookup(struct net *net,
         struct sock *sk;
 
         local_bh_disable();
-        sk = __inet_lookup(net, hashinfo, saddr, sport, daddr, dport, dif);
+        sk = __inet_lookup(net, hashinfo, skb, doff, saddr, sport, daddr,
+                           dport, dif);
         local_bh_enable();
 
         return sk;
@@ -328,6 +333,7 @@ static inline struct sock *inet_lookup(struct net *net,
 
 static inline struct sock *__inet_lookup_skb(struct inet_hashinfo *hashinfo,
                                              struct sk_buff *skb,
+                                             int doff,
                                              const __be16 sport,
                                              const __be16 dport)
 {
@@ -337,8 +343,8 @@ static inline struct sock *__inet_lookup_skb(struct inet_hashinfo *hashinfo,
         if (sk)
                 return sk;
         else
-                return __inet_lookup(dev_net(skb_dst(skb)->dev), hashinfo,
-                                     iph->saddr, sport,
+                return __inet_lookup(dev_net(skb_dst(skb)->dev), hashinfo, skb,
+                                     doff, iph->saddr, sport,
                                      iph->daddr, dport, inet_iif(skb));
 }