net: ipv6: add second dif to inet6 socket lookups

Add a second device index, sdif, to inet6 socket lookups. sdif is the
index for ingress devices enslaved to an l3mdev. It allows the lookups
to consider the enslaved device as well as the L3 domain when searching
for a socket.

TCP moves the data in the cb. Prior to tcp_v4_rcv (e.g., early demux) the
ingress index is obtained from IPCB using inet_sdif and after tcp_v4_rcv
tcp_v4_sdif is used.

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

1 files changed, 8 insertions, 5 deletions

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index ced5dcf37465..f776ec4ecf6d 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -350,7 +350,7 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         sk = __inet6_lookup_established(net, &tcp_hashinfo,
                                         &hdr->daddr, th->dest,
                                         &hdr->saddr, ntohs(th->source),
-                                        skb->dev->ifindex);
+                                        skb->dev->ifindex, inet6_sdif(skb));
 
         if (!sk) {
                 __ICMP6_INC_STATS(net, __in6_dev_get(skb->dev),
@@ -918,7 +918,8 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb)
                                            &tcp_hashinfo, NULL, 0,
                                            &ipv6h->saddr,
                                            th->source, &ipv6h->daddr,
-                                           ntohs(th->source), tcp_v6_iif(skb));
+                                           ntohs(th->source), tcp_v6_iif(skb),
+                                           tcp_v6_sdif(skb));
                 if (!sk1)
                         goto out;
 
@@ -1397,6 +1398,7 @@ static void tcp_v6_fill_cb(struct sk_buff *skb, const struct ipv6hdr *hdr,
 
 static int tcp_v6_rcv(struct sk_buff *skb)
 {
+        int sdif = inet6_sdif(skb);
         const struct tcphdr *th;
         const struct ipv6hdr *hdr;
         bool refcounted;
@@ -1430,7 +1432,7 @@ static int tcp_v6_rcv(struct sk_buff *skb)
 
 lookup:
         sk = __inet6_lookup_skb(&tcp_hashinfo, skb, __tcp_hdrlen(th),
-                                th->source, th->dest, inet6_iif(skb),
+                                th->source, th->dest, inet6_iif(skb), sdif,
                                 &refcounted);
         if (!sk)
                 goto no_tcp_socket;
@@ -1563,7 +1565,8 @@ do_time_wait:
                                             skb, __tcp_hdrlen(th),
                                             &ipv6_hdr(skb)->saddr, th->source,
                                             &ipv6_hdr(skb)->daddr,
-                                            ntohs(th->dest), tcp_v6_iif(skb));
+                                            ntohs(th->dest), tcp_v6_iif(skb),
+                                            sdif);
                 if (sk2) {
                         struct inet_timewait_sock *tw = inet_twsk(sk);
                         inet_twsk_deschedule_put(tw);
@@ -1610,7 +1613,7 @@ static void tcp_v6_early_demux(struct sk_buff *skb)
         sk = __inet6_lookup_established(dev_net(skb->dev), &tcp_hashinfo,
                                         &hdr->saddr, th->source,
                                         &hdr->daddr, ntohs(th->dest),
-                                        inet6_iif(skb));
+                                        inet6_iif(skb), inet6_sdif(skb));
         if (sk) {
                 skb->sk = sk;
                 skb->destructor = sock_edemux;